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-13 00:39:12 +00:00
parent c5912db983
commit 902d44e6de
6 changed files with 18 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CASA-auth-token/server-java/Svc/external/Makefile.am vendored
View File

@@ -22,7 +22,7 @@
SUBDIRS =
DIST_SUBDIRS =
DIST_SUBDIRS = xmlsec
CFILES =

16
CASA-auth-token/server-java/Svc/linux/Makefile.am
View File

@@ -43,7 +43,7 @@ ROOT = ../..
LIBDIR = $(ROOT)/$(LIB)
IDENT_ABSTRACTION_DIR = /usr/share/java/identity-abstraction
AXIS_JARS_DIR = ../external
XMLSEC_JARS_DIR = ../external/xmlsec/xml-security-1_4_0/libs
MANIFEST_DIR = ../manifest
@@ -65,7 +65,6 @@ JAVAFILES = ../src/com/novell/casa/authtoksvc/ProtoDefs.java \
../src/com/novell/casa/authtoksvc/AuthTokenConfig.java \
../src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java \
../src/com/novell/casa/authtoksvc/AuthMechanism.java \
../src/com/novell/casa/authtoksvc/WSSecurity.java \
../src/com/novell/casa/authtoksvc/SessionToken.java \
../src/com/novell/casa/authtoksvc/Authenticate.java \
../src/com/novell/casa/authtoksvc/RpcMethod.java \
@@ -91,6 +90,7 @@ JAVAFILES = ../src/com/novell/casa/authtoksvc/ProtoDefs.java \
../src/com/novell/casa/authtoksvc/AuthTokenSettingsEditor.java \
../src/com/novell/casa/authtoksvc/IdenTokenSettingsEditor.java \
../src/com/novell/casa/authtoksvc/RealmsInfo.java \
../src/com/novell/casa/authtoksvc/SecureTokenUtil.java \
../src/com/novell/casa/authtoksvc/SvcSettingsEditor.java
BUILDDIR = ../build
@@ -126,12 +126,10 @@ AUTH_POLICY_EDITOR = $(AUTH_POLICY_EDITOR_MODULE_NAME).$(MODULE_EXT)
CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class))
#AXIS_LIBS = $(AXIS_JARS_DIR)/axis.jar:$(AXIS_JARS_DIR)/axis-ant.jar:$(AXIS_JARS_DIR)/commons-discovery-0.2.jar:$(AXIS_JARS_DIR)/commons-logging-1.0.4.jar:$(AXIS_JARS_DIR)/commons-logging-api.jar:$(AXIS_JARS_DIR)/jaxrpc.jar:$(AXIS_JARS_DIR)/log4j-1.2.8.jar:$(AXIS_JARS_DIR)/saaj.jar:$(AXIS_JARS_DIR)/wsdl4j-1.5.1.jar:$(AXIS_JARS_DIR)/wss4j-1.5.0.jar:$(AXIS_JARS_DIR)/xalan.jar:$(AXIS_JARS_DIR)/xercesImpl.jar:$(AXIS_JARS_DIR)/xml-apis.jar:$(AXIS_JARS_DIR)/xmlsec-1.2.1.jar
AXIS_LIBS = $(AXIS_JARS_DIR)/axis.jar:$(AXIS_JARS_DIR)/saaj.jar:$(AXIS_JARS_DIR)/wss4j-1.5.0.jar:$(AXIS_JARS_DIR)/xmlsec-1.2.1.jar
#AXIS_LIBS = $(AXIS_JARS_DIR)/wss4j-1.5.0.jar
XMLSEC_LIBS = $(XMLSEC_JARS_DIR)/xmlsec-1.4.0.jar
LIBS = /usr/share/java/servletapi5.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/log4j.jar
CLASSPATH = $(AXIS_LIBS):$(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(IDENT_ABSTRACTION_DIR)/bandit-util.jar:$(IDENT_ABSTRACTION_DIR)/castor-1.0.4.jar:$(LIBS)
LIBS = /usr/share/java/servletapi5.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/log4j.jar:/usr/share/java/commons-logging.jar:/usr/share/java/xalan-j2.jar
CLASSPATH = $(XMLSEC_LIBS):$(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(IDENT_ABSTRACTION_DIR)/bandit-util.jar:$(IDENT_ABSTRACTION_DIR)/castor-1.0.4.jar:$(LIBS)
CUR_DIR := $(shell pwd)
@@ -154,9 +152,7 @@ $(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES)
cp ../linux/crypto.properties $(BUILDDIR)/webapp/WEB-INF/classes/crypto.properties
cp ../src/com/novell/casa/authtoksvc/Krb5_mechanism.settings $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/Krb5Authenticate/mechanism.settings
cp ../src/com/novell/casa/authtoksvc/Pwd_mechanism.settings $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate/mechanism.settings
cp $(AXIS_JARS_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/
rm $(BUILDDIR)/webapp/WEB-INF/lib/xercesImpl.jar
rm $(BUILDDIR)/webapp/WEB-INF/lib/log4j-1.2.8.jar
cp $(XMLSEC_JARS_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/
ls $(BUILDDIR)/webapp/WEB-INF/lib/
jar cvf $(BUILDDIR)/$(WEBAPP) -C $(BUILDDIR)/webapp .
cp $(BUILDDIR)/$(WEBAPP) $(LIBDIR)/java/

4
CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/Makefile.am
View File

@@ -49,7 +49,6 @@ JAVAFILES = ProtoDefs.java \
Krb5Authenticate.java \
PwdAuthenticate.java \
SessionToken.java \
WSSecurity.java \
AuthPolicyEditor.java \
AuthTokenSettingsEditor.java \
IdenTokenSettingsEditor.java \
@@ -57,7 +56,8 @@ JAVAFILES = ProtoDefs.java \
SettingsFileUtil.java \
SettingsFileSAXHandler.java \
RealmsInfo.java \
SvcSettingsEditor.java
SvcSettingsEditor.java \
SecureTokenUtil.java
EXTRA_DIST = $(JAVAFILES) \
Krb5_mechanism.settings \

2
CASA-auth-token/server-java/Svc/windows/Makefile.am
View File

@@ -58,7 +58,6 @@ JAVAFILES = ../src/com/novell/casa/authtoksvc/ProtoDefs.java \
../src/com/novell/casa/authtoksvc/AuthTokenConfig.java \
../src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java \
../src/com/novell/casa/authtoksvc/AuthMechanism.java \
../src/com/novell/casa/authtoksvc/WSSecurity.java \
../src/com/novell/casa/authtoksvc/SessionToken.java \
../src/com/novell/casa/authtoksvc/Authenticate.java \
../src/com/novell/casa/authtoksvc/RpcMethod.java \
@@ -84,6 +83,7 @@ JAVAFILES = ../src/com/novell/casa/authtoksvc/ProtoDefs.java \
../src/com/novell/casa/authtoksvc/AuthTokenSettingsEditor.java \
../src/com/novell/casa/authtoksvc/IdenTokenSettingsEditor.java \
../src/com/novell/casa/authtoksvc/RealmsInfo.java \
../src/com/novell/casa/authtoksvc/SecureTokenUtil.java \
../src/com/novell/casa/authtoksvc/SvcSettingsEditor.java
BUILDDIR = ../build