geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Continuation of changes to remove Axis dependency.

Browse Source
This commit is contained in:
Juan Carlos Luciani
2007-03-15 17:18:58 +00:00
parent 425d94dc9f
commit 7314c08267
36 changed files with 82 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in
View File

@@ -18,7 +18,7 @@
Name: @PACKAGE@
URL: http://www.novell.com/products
BuildRequires: gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit xerces-j2 xml-commons-apis
BuildRequires: java-sdk-1.5.0 update-alternatives log4j xalan-j2 jakarta-commons-logging
BuildRequires: java-sdk-1.5.0 update-alternatives log4j jakarta-commons-logging
%define prefix /usr
License: LGPL
Group: Applications/System
@@ -30,7 +30,7 @@ Summary: Novell CASA Authentication Token Service
Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: jre >= 1.5.0
Requires: servletapi5 tomcat5 sysvinit insserv identity-abstraction sed log4j xalan-j2 jakarta-commons-logging
Requires: servletapi5 tomcat5 sysvinit insserv identity-abstraction sed log4j xerces-j2
PreReq: %fillup_prereq %insserv_prereq
PreReq: /usr/bin/awk, /usr/bin/test, /bin/grep, /bin/cat, /usr/bin/install, /bin/pwd
PreReq: /usr/sbin/groupadd, /usr/sbin/useradd, /usr/sbin/userdel, /usr/bin/getent
@@ -56,7 +56,7 @@ services that are CASA authentication enabled.
Summary: Novell CASA Authentication Token JAAS Support Components
Group: Applications/System
Requires: jre >= 1.5.0
Requires: log4j xalan-j2 jakarta-commons-logging
Requires: log4j jakarta-commons-logging xerces-j2
%description -n CASA_auth_token_jaas_support
CASA_auth_token is an authentication token infrastructure with support for
@@ -188,7 +188,8 @@ install -m 600 Svc/tomcat5/conf/web.xml %{buildroot}/srv/www/casaats/conf/web.xm
install -m 755 %{_lib}/java/CasaJaasSupport.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaJaasSupport-%{bldno}.jar
install -m 755 %{_lib}/java/CasaAuthToken.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaAuthToken-%{bldno}.jar
install -m 755 Svc/external/xmlsec/xml-security-1_4_0/libs/xmlsec-1.4.0.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.4.0.jar
install -m 644 Jaas/linux/crypto.properties %{buildroot}/etc/CASA/authtoken/keys/client/crypto.properties
install -m 644 Svc/external/xmlsec/xml-security-1_4_0/LICENSE %{buildroot}%{prefix}/share/java/CASA/authtoken/external/LICENSE
install -m 644 Jaas/linux/casa_crypto.properties %{buildroot}/etc/CASA/authtoken/keys/client/casa_crypto.properties
# Symbolic Links
ln -sf CasaJaasSupport-%{bldno}.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaJaasSupport.jar
@@ -339,7 +340,8 @@ rm -f /srv/www/casaats/conf/server.xml
%{prefix}/share/java/CASA/authtoken/CasaAuthToken.jar
%{prefix}/share/java/CASA/authtoken/bin/client_keystore_setup.sh
%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.4.0.jar
%config /etc/CASA/authtoken/keys/client/crypto.properties
%{prefix}/share/java/CASA/authtoken/external/LICENSE
%config /etc/CASA/authtoken/keys/client/casa_crypto.properties
%changelog -n CASA_auth_token_svc

45
CASA-auth-token/server-java/package/linux/CASA_auth_token_svc_4zen.spec.in
View File

@@ -17,8 +17,8 @@
Name: @PACKAGE@
URL: http://www.novell.com/products
BuildRequires: gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit xerces-j2 jdk novell-zenworks-java-links
BuildRequires: java-sdk-1.5.0 update-alternatives log4j
BuildRequires: gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit xerces-j2 jdk novell-zenworks-java-links xml-commons-apis
BuildRequires: java-sdk-1.5.0 update-alternatives log4j jakarta-commons-logging
%define prefix /usr
License: LGPL
Group: Applications/System
@@ -30,7 +30,7 @@ Summary: Novell CASA Authentication Token Service
Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: jre >= 1.5.0
Requires: novell-zenworks-tomcat sysvinit insserv identity-abstraction sed jdk novell-zenworks-java-links log4j
Requires: novell-zenworks-tomcat sysvinit insserv identity-abstraction sed jdk novell-zenworks-java-links log4j xerces-j2
PreReq: %fillup_prereq %insserv_prereq
PreReq: /usr/bin/awk, /usr/bin/test, /bin/grep, /bin/cat, /usr/bin/install, /bin/pwd
PreReq: /usr/sbin/groupadd, /usr/sbin/useradd, /usr/sbin/userdel, /usr/bin/getent
@@ -56,6 +56,7 @@ services that are CASA authentication enabled.
Summary: Novell CASA Authentication Token JAAS Support Components
Group: Applications/System
Requires: jre >= 1.5.0 CASA_auth_token_svc jdk novell-zenworks-java-links log4j
Requires: log4j jakarta-commons-logging xerces-j2
%description -n CASA_auth_token_jaas_support
CASA_auth_token is an authentication token infrastructure with support for
@@ -186,22 +187,9 @@ install -m 600 Svc/tomcat5/conf/web.xml %{buildroot}/srv/www/casaats/conf/web.xm
# Libs
install -m 755 %{_lib}/java/CasaJaasSupport.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaJaasSupport-%{bldno}.jar
install -m 755 %{_lib}/java/CasaAuthToken.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaAuthToken-%{bldno}.jar
install -m 755 Svc/external/axis.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/axis.jar
install -m 755 Svc/external/axis-ant.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/axis-ant.jar
install -m 755 Svc/external/commons-discovery-0.2.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/commons-discovery-0.2.jar
install -m 755 Svc/external/commons-logging-1.0.4.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/commons-logging-1.0.4.jar
install -m 755 Svc/external/commons-logging-api.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/commons-logging-api.jar
install -m 755 Svc/external/jaxrpc.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/jaxrpc.jar
install -m 755 Svc/external/log4j.properties %{buildroot}%{prefix}/share/java/CASA/authtoken/external/log4j.properties
install -m 755 Svc/external/log4j-1.2.8.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/log4j-1.2.8.jar
install -m 755 Svc/external/saaj.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/saaj.jar
install -m 755 Svc/external/wsdl4j-1.5.1.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/wsdl4j-1.5.1.jar
install -m 755 Svc/external/wss4j-1.5.0.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/wss4j-1.5.0.jar
install -m 755 Svc/external/xalan.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xalan.jar
install -m 755 Svc/external/xercesImpl.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xercesImpl.jar
install -m 755 Svc/external/xml-apis.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xml-apis.jar
install -m 755 Svc/external/xmlsec-1.2.1.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.2.1.jar
install -m 644 Jaas/linux/crypto.properties %{buildroot}/etc/CASA/authtoken/keys/client/crypto.properties
install -m 755 Svc/external/xmlsec/xml-security-1_4_0/libs/xmlsec-1.4.0.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.4.0.jar
install -m 644 Svc/external/xmlsec/xml-security-1_4_0/LICENSE %{buildroot}%{prefix}/share/java/CASA/authtoken/external/LICENSE
install -m 644 Jaas/linux/casa_crypto.properties %{buildroot}/etc/CASA/authtoken/keys/client/casa_crypto.properties
# Symbolic Links
ln -sf CasaJaasSupport-%{bldno}.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaJaasSupport.jar
@@ -351,22 +339,9 @@ rm -f /srv/www/casaats/conf/server.xml
%{prefix}/share/java/CASA/authtoken/CasaAuthToken-%{bldno}.jar
%{prefix}/share/java/CASA/authtoken/CasaAuthToken.jar
%{prefix}/share/java/CASA/authtoken/bin/client_keystore_setup.sh
%{prefix}/share/java/CASA/authtoken/external/axis.jar
%{prefix}/share/java/CASA/authtoken/external/axis-ant.jar
%{prefix}/share/java/CASA/authtoken/external/commons-discovery-0.2.jar
%{prefix}/share/java/CASA/authtoken/external/commons-logging-1.0.4.jar
%{prefix}/share/java/CASA/authtoken/external/commons-logging-api.jar
%{prefix}/share/java/CASA/authtoken/external/jaxrpc.jar
%{prefix}/share/java/CASA/authtoken/external/log4j.properties
%{prefix}/share/java/CASA/authtoken/external/log4j-1.2.8.jar
%{prefix}/share/java/CASA/authtoken/external/saaj.jar
%{prefix}/share/java/CASA/authtoken/external/wsdl4j-1.5.1.jar
%{prefix}/share/java/CASA/authtoken/external/wss4j-1.5.0.jar
%{prefix}/share/java/CASA/authtoken/external/xalan.jar
%{prefix}/share/java/CASA/authtoken/external/xercesImpl.jar
%{prefix}/share/java/CASA/authtoken/external/xml-apis.jar
%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.2.1.jar
%config /etc/CASA/authtoken/keys/client/crypto.properties
%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.4.0.jar
%{prefix}/share/java/CASA/authtoken/external/LICENSE
%config /etc/CASA/authtoken/keys/client/casa_crypto.properties
%changelog -n CASA_auth_token_svc

8
CASA-auth-token/server-java/package/windows/UpdateWarFile/UpdateWarFile.java
View File

@@ -254,9 +254,9 @@ public class UpdateWarFile
{
int i;
String [] rgsFilesToAdd = new String[1];
rgsFilesToAdd[0] = sInstallDir + "ats\\etc\\svc\\templates\\crypto.properties";
rgsFilesToAdd[0] = sInstallDir + "ats\\etc\\svc\\templates\\casa_crypto.properties";
String [] rgsNames = new String[1];
rgsNames[0] = "WEB-INF/classes/crypto.properties";
rgsNames[0] = "WEB-INF/classes/casa_crypto.properties";
for (i = 0; i < rgsFilesToAdd.length; i++)
{
log("Adding file: " + rgsFilesToAdd[i] + " with name " + rgsNames[i]);
@@ -324,9 +324,9 @@ public class UpdateWarFile
jeLoop = (ZipEntry)entries.nextElement();
// Skip WEB-INF/classes/cypto.properties
if (jeLoop.getName().equalsIgnoreCase("WEB-INF/classes/crypto.properties"))
if (jeLoop.getName().equalsIgnoreCase("WEB-INF/classes/casa_crypto.properties"))
{
log("skipping: " + "WEB-INF/classes/crypto.properties");
log("skipping: " + "WEB-INF/classes/casa_crypto.properties");
continue;
}

20
CASA-auth-token/server-java/package/windows/server-java_msi/server-java_msi.vdproj
View File

@@ -510,12 +510,12 @@
}
"{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_4A2EA62CF7E74BCF99C43F5A0C68CE7F"
{
"Name" = "8:CommandLauncher.exe (DeleteFile - crypto.properties) Must occur after UpdateWarFile"
"Name" = "8:CommandLauncher.exe (DeleteFile - casa_crypto.properties) Must occur after UpdateWarFile"
"Condition" = "8:"
"Object" = "8:_32E2D317FBCD4B25904D5402E547B8A8"
"FileType" = "3:2"
"InstallAction" = "3:1"
"Arguments" = "8:[ATS_JAVA_EXE] -cp [TARGETDIR]ats\\bin DeleteFile file=[TARGETDIR]ats\\etc\\svc\\templates\\crypto.properties"
"Arguments" = "8:[ATS_JAVA_EXE] -cp [TARGETDIR]ats\\bin DeleteFile file=[TARGETDIR]ats\\etc\\svc\\templates\\casa_crypto.properties"
"EntryPoint" = "8:"
"Sequence" = "3:7"
"Identifier" = "8:_41435F8A_10DA_454F_AE4E_55B6EDC859B1"
@@ -524,12 +524,12 @@
}
"{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_4AB953C8E8AA4E44B7A3D2DDD163C040"
{
"Name" = "8:CommandLauncher.exe (MungeCryptoPropertiesFilePath) Must occur after InitConfigFile for crypto.properties and prior to UpdateWarFile"
"Name" = "8:CommandLauncher.exe (MungeCryptoPropertiesFilePath) Must occur after InitConfigFile for casa_crypto.properties and prior to UpdateWarFile"
"Condition" = "8:"
"Object" = "8:_32E2D317FBCD4B25904D5402E547B8A8"
"FileType" = "3:2"
"InstallAction" = "3:1"
"Arguments" = "8:[ATS_JAVA_EXE] -cp [TARGETDIR]ats\\bin MungeCryptoPropertiesFilePath input=[TARGETDIR]ats\\etc\\svc\\templates\\crypto.properties.munge output=[TARGETDIR]ats\\etc\\svc\\templates\\crypto.properties"
"Arguments" = "8:[ATS_JAVA_EXE] -cp [TARGETDIR]ats\\bin MungeCryptoPropertiesFilePath input=[TARGETDIR]ats\\etc\\svc\\templates\\casa_crypto.properties.munge output=[TARGETDIR]ats\\etc\\svc\\templates\\casa_crypto.properties"
"EntryPoint" = "8:"
"Sequence" = "3:5"
"Identifier" = "8:_489F695D_617D_408B_A286_9096FF4C6030"
@@ -720,12 +720,12 @@
}
"{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_CBD36E7C65454FAEAFAFBB089F552379"
{
"Name" = "8:CommandLauncher.exe (InitConfigFile - crypto.properties) Must occur prior to MungeCryptoPropertiesFilePath"
"Name" = "8:CommandLauncher.exe (InitConfigFile - casa_crypto.properties) Must occur prior to MungeCryptoPropertiesFilePath"
"Condition" = "8:"
"Object" = "8:_32E2D317FBCD4B25904D5402E547B8A8"
"FileType" = "3:2"
"InstallAction" = "3:1"
"Arguments" = "8:[ATS_JAVA_EXE] -cp [TARGETDIR]ats\\bin InitConfigFile ATS_INSTALL_DIR=[TARGETDIR] template=[TARGETDIR]ats\\etc\\svc\\templates\\crypto.properties.template output=[TARGETDIR]ats\\etc\\svc\\templates\\crypto.properties.munge"
"Arguments" = "8:[ATS_JAVA_EXE] -cp [TARGETDIR]ats\\bin InitConfigFile ATS_INSTALL_DIR=[TARGETDIR] template=[TARGETDIR]ats\\etc\\svc\\templates\\casa_crypto.properties.template output=[TARGETDIR]ats\\etc\\svc\\templates\\casa_crypto.properties.munge"
"EntryPoint" = "8:"
"Sequence" = "3:4"
"Identifier" = "8:_52B37947_0117_4E54_A3CE_CE1092EF5AFF"
@@ -762,12 +762,12 @@
}
"{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_E40220C987784FAD9A06EE2D5DE2EE04"
{
"Name" = "8:CommandLauncher.exe (DeleteFile - crypto.properties.munge) Must occur after MungeCryptoPropertiesFilePath"
"Name" = "8:CommandLauncher.exe (DeleteFile - casa_crypto.properties.munge) Must occur after MungeCryptoPropertiesFilePath"
"Condition" = "8:"
"Object" = "8:_32E2D317FBCD4B25904D5402E547B8A8"
"FileType" = "3:2"
"InstallAction" = "3:1"
"Arguments" = "8:[ATS_JAVA_EXE] -cp [TARGETDIR]ats\\bin DeleteFile file=[TARGETDIR]ats\\etc\\svc\\templates\\crypto.properties.munge"
"Arguments" = "8:[ATS_JAVA_EXE] -cp [TARGETDIR]ats\\bin DeleteFile file=[TARGETDIR]ats\\etc\\svc\\templates\\casa_crypto.properties.munge"
"EntryPoint" = "8:"
"Sequence" = "3:8"
"Identifier" = "8:_9B4A731D_B624_4E26_9350_EEEEA32D8892"
@@ -1761,8 +1761,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D945234C1C494DDCAB2C8537CE4D1C1C"
{
"SourcePath" = "8:..\\..\\..\\Svc\\windows\\crypto.properties"
"TargetName" = "8:crypto.properties.template"
"SourcePath" = "8:..\\..\\..\\Svc\\windows\\casa_crypto.properties"
"TargetName" = "8:casa_crypto.properties.template"
"Tag" = "8:"
"Folder" = "8:_DB2EB303AA7A4FA0874CCF7DE23125AB"
"Condition" = "8:"