From bb9f421dff32bba46168bfb2700218ab973a4021 Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Thu, 27 Jul 2006 18:12:55 +0000 Subject: [PATCH] Modifications to get us closer to submit this part of the project to autobuild. --- CASA-auth-token/java/Makefile.am | 2 +- CASA-auth-token/java/autogen.sh | 2 +- CASA-auth-token/java/configure.in | 39 +-- .../linux/CASA-auth-token-service.spec.in | 312 ------------------ .../package/linux/CASA_auth_token_svc.spec.in | 163 +++++++++ .../java/package/linux/Makefile.am | 2 +- .../server/{JaasSupport => Jaas}/.classpath | 0 .../server/{JaasSupport => Jaas}/.project | 0 .../server/{JaasSupport => Jaas}/Makefile.am | 0 .../java/server/{JaasSupport => Jaas}/README | 0 .../java/server/{JaasSupport => Jaas}/TODO | 0 .../make_and_run_test.sh | 0 .../{AuthTokenSvc => Jaas}/src/Makefile.am | 0 .../src/com/Makefile.am | 0 .../src/com/novell/Makefile.am | 0 .../src/com/novell/casa/Makefile.am | 0 .../com/novell/casa/jaas/CasaLoginModule.java | 0 .../com/novell/casa/jaas/CasaPrincipal.java | 0 .../src/com/novell/casa/jaas/Makefile.am | 0 .../novell/casa/jaas/sample/SampleApp.conf | 0 .../novell/casa/jaas/sample/SampleApp.java | 0 .../jaas/sample/SampleAppCallbackHandler.java | 0 CASA-auth-token/java/server/Makefile.am | 5 +- .../server/{AuthTokenSvc => Svc}/.project | 0 .../server/{AuthTokenSvc => Svc}/Makefile.am | 9 +- .../java/server/{AuthTokenSvc => Svc}/README | 0 .../java/server/{AuthTokenSvc => Svc}/TODO | 0 .../{AuthTokenSvc => Svc}/authtoken.settings | 0 .../{AuthTokenSvc => Svc}/identoken.settings | 0 .../sampleConf/auth.policy | 0 .../Krb5Authenticate/mechanism.settings | 0 .../PwdAuthenticate/mechanism.settings | 0 .../sampleConf/authtoken.settings | 0 .../testService/auth.policy | 0 .../testService/authtoken.settings | 0 .../testService/identoken.settings | 0 .../sampleConf/iaRealms.xml | 0 .../sampleConf/identoken.settings | 0 .../sampleConf/svc.settings | 0 .../{JaasSupport => Svc}/src/Makefile.am | 0 .../{JaasSupport => Svc}/src/com/Makefile.am | 0 .../src/com/novell/Makefile.am | 0 .../src/com/novell/casa/Makefile.am | 0 .../casa/authtoksvc/AuthMechConfig.java | 0 .../novell/casa/authtoksvc/AuthMechanism.java | 0 .../novell/casa/authtoksvc/AuthReqMsg.java | 0 .../novell/casa/authtoksvc/AuthRespMsg.java | 0 .../com/novell/casa/authtoksvc/AuthToken.java | 0 .../casa/authtoksvc/AuthTokenConfig.java | 0 .../novell/casa/authtoksvc/Authenticate.java | 0 .../novell/casa/authtoksvc/Base64Coder.java | 0 .../casa/authtoksvc/CasaIdentityToken.java | 0 .../casa/authtoksvc/EnabledSvcsConfig.java | 0 .../novell/casa/authtoksvc/GetAuthPolicy.java | 0 .../casa/authtoksvc/GetAuthPolicyReqMsg.java | 0 .../casa/authtoksvc/GetAuthPolicyRespMsg.java | 0 .../casa/authtoksvc/GetAuthTokReqMsg.java | 0 .../casa/authtoksvc/GetAuthTokRespMsg.java | 0 .../novell/casa/authtoksvc/GetAuthToken.java | 0 .../casa/authtoksvc/IdenTokenConfig.java | 0 .../novell/casa/authtoksvc/IdentityToken.java | 0 .../casa/authtoksvc/Krb5Authenticate.java | 0 .../casa/authtoksvc/Krb5_mechanism.settings | 0 .../com/novell/casa/authtoksvc/Makefile.am | 0 .../com/novell/casa/authtoksvc/ProtoDefs.java | 0 .../casa/authtoksvc/PwdAuthenticate.java | 0 .../casa/authtoksvc/Pwd_mechanism.settings | 0 .../src/com/novell/casa/authtoksvc/Rpc.java | 0 .../com/novell/casa/authtoksvc/RpcMethod.java | 0 .../novell/casa/authtoksvc/SessionToken.java | 0 .../com/novell/casa/authtoksvc/SvcConfig.java | 0 .../server/{AuthTokenSvc => Svc}/svc.settings | 0 .../java/server/{AuthTokenSvc => Svc}/web.xml | 0 73 files changed, 188 insertions(+), 346 deletions(-) delete mode 100644 CASA-auth-token/java/package/linux/CASA-auth-token-service.spec.in create mode 100644 CASA-auth-token/java/package/linux/CASA_auth_token_svc.spec.in rename CASA-auth-token/java/server/{JaasSupport => Jaas}/.classpath (100%) rename CASA-auth-token/java/server/{JaasSupport => Jaas}/.project (100%) rename CASA-auth-token/java/server/{JaasSupport => Jaas}/Makefile.am (100%) rename CASA-auth-token/java/server/{JaasSupport => Jaas}/README (100%) rename CASA-auth-token/java/server/{JaasSupport => Jaas}/TODO (100%) rename CASA-auth-token/java/server/{JaasSupport => Jaas}/make_and_run_test.sh (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Jaas}/src/Makefile.am (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Jaas}/src/com/Makefile.am (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Jaas}/src/com/novell/Makefile.am (100%) rename CASA-auth-token/java/server/{JaasSupport => Jaas}/src/com/novell/casa/Makefile.am (100%) rename CASA-auth-token/java/server/{JaasSupport => Jaas}/src/com/novell/casa/jaas/CasaLoginModule.java (100%) rename CASA-auth-token/java/server/{JaasSupport => Jaas}/src/com/novell/casa/jaas/CasaPrincipal.java (100%) rename CASA-auth-token/java/server/{JaasSupport => Jaas}/src/com/novell/casa/jaas/Makefile.am (100%) rename CASA-auth-token/java/server/{JaasSupport => Jaas}/src/com/novell/casa/jaas/sample/SampleApp.conf (100%) rename CASA-auth-token/java/server/{JaasSupport => Jaas}/src/com/novell/casa/jaas/sample/SampleApp.java (100%) rename CASA-auth-token/java/server/{JaasSupport => Jaas}/src/com/novell/casa/jaas/sample/SampleAppCallbackHandler.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/.project (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/Makefile.am (93%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/README (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/TODO (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/authtoken.settings (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/identoken.settings (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/sampleConf/auth.policy (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/sampleConf/auth_mechanisms/Krb5Authenticate/mechanism.settings (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/sampleConf/auth_mechanisms/PwdAuthenticate/mechanism.settings (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/sampleConf/authtoken.settings (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/sampleConf/enabled_services/appserver.companyname.com/testService/auth.policy (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/sampleConf/enabled_services/appserver.companyname.com/testService/authtoken.settings (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/sampleConf/iaRealms.xml (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/sampleConf/identoken.settings (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/sampleConf/svc.settings (100%) rename CASA-auth-token/java/server/{JaasSupport => Svc}/src/Makefile.am (100%) rename CASA-auth-token/java/server/{JaasSupport => Svc}/src/com/Makefile.am (100%) rename CASA-auth-token/java/server/{JaasSupport => Svc}/src/com/novell/Makefile.am (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/Makefile.am (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/AuthMechConfig.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/AuthMechanism.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/AuthReqMsg.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/AuthRespMsg.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/AuthToken.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/AuthTokenConfig.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/Authenticate.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/Base64Coder.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/CasaIdentityToken.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/GetAuthPolicy.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/GetAuthPolicyRespMsg.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/GetAuthTokRespMsg.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/GetAuthToken.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/IdenTokenConfig.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/IdentityToken.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/Krb5Authenticate.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/Makefile.am (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/ProtoDefs.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/PwdAuthenticate.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/Rpc.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/RpcMethod.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/SessionToken.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/src/com/novell/casa/authtoksvc/SvcConfig.java (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/svc.settings (100%) rename CASA-auth-token/java/server/{AuthTokenSvc => Svc}/web.xml (100%) diff --git a/CASA-auth-token/java/Makefile.am b/CASA-auth-token/java/Makefile.am index 84e5e7ff..de932907 100644 --- a/CASA-auth-token/java/Makefile.am +++ b/CASA-auth-token/java/Makefile.am @@ -22,7 +22,7 @@ SUBDIRS = server package -DIST_SUBDIRS = include server package +DIST_SUBDIRS = server package EXTRA_DIST = autogen.sh diff --git a/CASA-auth-token/java/autogen.sh b/CASA-auth-token/java/autogen.sh index 56e0f00c..b0aaea55 100755 --- a/CASA-auth-token/java/autogen.sh +++ b/CASA-auth-token/java/autogen.sh @@ -8,7 +8,7 @@ ORIGDIR=`pwd` cd $srcdir PROJECT=CASA TEST_TYPE=-f -FILE=server/AuthTokenSvc/authtoken.settings +FILE=configure.in DIE=0 diff --git a/CASA-auth-token/java/configure.in b/CASA-auth-token/java/configure.in index 26afd547..7e65551f 100644 --- a/CASA-auth-token/java/configure.in +++ b/CASA-auth-token/java/configure.in @@ -21,7 +21,7 @@ AC_INIT(autogen.sh) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(CASA_auth_token, 0.1.1) +AM_INIT_AUTOMAKE(CASA_auth_token_svc, 0.1.1) RELEASE=`date +%Y%m%d_%H%M` AC_SUBST(RELEASE) AM_MAINTAINER_MODE @@ -262,30 +262,19 @@ AC_OUTPUT([ Makefile package/Makefile package/linux/Makefile -package/linux/CASA-auth-token-service.spec -include/Makefile +package/linux/CASA_auth_token_svc.spec server/Makefile -server/AuthTokenValidate/Makefile -server/AuthTokenValidate/linux/Makefile -server/AuthTokenValidate/idenTokenProviders/Makefile -server/AuthTokenValidate/idenTokenProviders/casa/Makefile -server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile -server/PamSupport/Makefile -server/PamSupport/linux/Makefile -server/ApacheSupport/Makefile -server/ApacheSupport/2.2/Makefile -server/ApacheSupport/2.2/linux/Makefile -server/AuthTokenSvc/Makefile -server/AuthTokenSvc/src/Makefile -server/AuthTokenSvc/src/com/Makefile -server/AuthTokenSvc/src/com/novell/Makefile -server/AuthTokenSvc/src/com/novell/casa/Makefile -server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Makefile -server/JaasSupport/Makefile -server/JaasSupport/src/Makefile -server/JaasSupport/src/com/Makefile -server/JaasSupport/src/com/novell/Makefile -server/JaasSupport/src/com/novell/casa/Makefile -server/JaasSupport/src/com/novell/casa/jaas/Makefile +server/Svc/Makefile +server/Svc/src/Makefile +server/Svc/src/com/Makefile +server/Svc/src/com/novell/Makefile +server/Svc/src/com/novell/casa/Makefile +server/Svc/src/com/novell/casa/authtoksvc/Makefile +server/Jaas/Makefile +server/Jaas/src/Makefile +server/Jaas/src/com/Makefile +server/Jaas/src/com/novell/Makefile +server/Jaas/src/com/novell/casa/Makefile +server/Jaas/src/com/novell/casa/jaas/Makefile ]) diff --git a/CASA-auth-token/java/package/linux/CASA-auth-token-service.spec.in b/CASA-auth-token/java/package/linux/CASA-auth-token-service.spec.in deleted file mode 100644 index 8d62cad7..00000000 --- a/CASA-auth-token/java/package/linux/CASA-auth-token-service.spec.in +++ /dev/null @@ -1,312 +0,0 @@ -# -# spec file for the CASA-auth-token packages. -# -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. -# -# Please submit bugfixes or comments via http://bugs.opensuse.org -# - -# norootforbuild - -# For debug build, please replace Release to Debug and set debug_opt to --enable-debug -%define cfg Release -%define debug_opt "" - - -Name: @PACKAGE@ -URL: http://www.novell.com/products -BuildRequires: libstdc++ libgcc gcc-c++ glib2-devel krb5-devel libgssapi libstdc++-devel pam-devel pkgconfig java-1_5_0-ibm-devel apache2-devel update-alternatives mono-devel CASA-devel servletapi5 identity-abstraction -%define prefix /usr -%define jprefix /usr/share/java -License: LGPL -Group: Applications/System -Autoreqprov: on -%define bldno 1.0.0 -Version: @VERSION@ -Release: 0 -Summary: Novell Common Authentication Services Adapter Authentication Token Infrastructure (CASA-auth-token) -Source: %{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: java-1_5_0-ibm servletapi5 tomcat5 -PreReq: %fillup_prereq %insserv_prereq - -%description -CASA-auth-token is an authentication token infrastructure with support for multiple -authentication mechanisms with an emphasis on providing a scalable single -sign-on solution. - -A key feature of CASA-auth-token is that its authentication tokens contain identity -information about the entity being authenticated. This information is made available -to the consuming services. The amount of information contained in the tokens is -configured on a per-service basis. Because of this feature, we say that CASA-auth-token -projects an "Authenticated Identity". - -The CASA-auth-token-service is the infrastructure component responsible for authenticating -entities using the native authentication mechanism and for issuing tokens that can later -be used by applications to authenticate the entity o services that are CASA authentication -enabled. - -%package -n CASA-auth-token-server-support -Summary: Libraries needed for "C" applications development. -Group: Applications/System -Requires: CASA-devel - -%description -n CASA-auth-token-server-support -This package contains the CASA (Common Authentication Services Adapter) -authentication token infrastructure lower level libraries for token -verification from native code ("C"). It is recomended that this library -not be invoked directly by applications, instead it is recomended that -appplication invoke its services through the support modules provided to -integrate with PAM or the Apache Web Server. - -%package -n CASA-auth-token-pam-support -Summary: Libraries needed for PAM applications development. -Group: Applications/System -Requires: CASA-auth-token-server-support pam - -%description -n CASA-auth-token-pam-support -This package contains the CASA (Common Authentication Services Adapter) -authentication token infrastructure PAM module for token verification. - -%package -n CASA-auth-token-apache2_2-support -Summary: Libraries needed for Apache 2.2 applications development. -Group: Applications/System -Requires: apache2 CASA-auth-token-server-support - -%description -n CASA-auth-token-apache2_2-support -This package contains the CASA (Common Authentication Services Adapter) -authentication token infrastructure Apache v2.2 authentication provider -module for token verification. The module expects that users authenticate -utilizing the HTTP Basic authentication scheme and that the password utilized consist -of a CASA authentication token. Information about the authenticated identity is -made available to other Apache modules via the Apache request environment variable. - -%package -n CASA-auth-token-jaas-support -Summary: Libraries needed for JAAS applications development. -Group: Applications/System -Requires: java-1_5_0-ibm - -%description -n CASA-auth-token-jaas-support -This package contains the CASA (Common Authentication Services Adapter) -authentication token infrastructure JAAS module and supporting libraries -for token verification. - -%package -n CASA-auth-token-devel -Summary: Include files needed for applications development. -Group: Applications/System -Requires: CASA-devel CASA-auth-token-server-support CASA-auth-token-jaas-support CASA-auth-token-pam-support CASA-auth-token-apache2_2-support CASA-auth-token-service - -%description -n CASA-auth-token-devel -This package contains the files necessary for the development of client and -server applications that utilize the CASA (Common Authentication Service Adapter) -authentication token infrastructure for authentication. - - -%prep -%setup -q -#%patch -%if %{_lib} == "lib64" -%define binsource bin64 -%else -%define binsource bin -%endif - -%build -export PATH=.:$PATH:/usr/%_lib/qt3/bin -%if %suse_version > 1000 -export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fstack-protector" -%endif - -./autogen.sh -make - - -%install - -## Prime the file system ## -install -d %{buildroot}%{prefix} -install -d %{buildroot}%{prefix}/%{_lib} -install -d %{buildroot}%{prefix}/%{_lib}/security -install -d %{buildroot}%{prefix}/include -install -d %{buildroot}%{prefix}/share -install -d %{buildroot}%{prefix}/share/java - -## CASA-auth-token-service ## -# Libs -install -m 755 %{_lib}/java/CasaAuthTokenSvc.war %{buildroot}%{prefix}/share/java/CasaAuthTokenSvc.war.%{bldno} - -# Lib Symbolic Links -ln -sf CasaAuthTokenSvc.war.%{bldno} %{buildroot}%{prefix}/share/java/CasaAuthTokenSvc.war -ln -sf CasaAuthTokenSvc.war.%{bldno} %{buildroot}%{prefix}/share/java/CasaAuthTokenSvc.war.1 - -## CASA-auth-token-server-support ## -# Libs -install -m 755 %{_lib}/%{cfg}/libcasa_s_authtoken.so %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.%{bldno} - -# Lib Symbolic Links -ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so -ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.1 - -## CASA-auth-token-pam-support ## -# Libs -install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so.%{bldno} -#install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so - -# Lib Symbolic Links -ln -sf pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so -ln -sf pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so.1 - -## CASA-auth-token-apache2_2-support ## -# Libs -install -m 755 %{_lib}/%{cfg}/mod_authn_casa.so %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.%{bldno} - -# Lib Symbolic Links -ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so -ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.1 - -## CASA-auth-token-jaas-support ## -# Libs -install -m 755 %{_lib}/java/CasaJaasSupport.jar %{buildroot}%{prefix}/share/java/CasaJaasSupport.jar.%{bldno} -install -m 755 %{_lib}/java/CasaAuthToken.jar %{buildroot}%{prefix}/share/java/CasaAuthToken.jar.%{bldno} - -# Lib Symbolic Links -ln -sf CasaJaasSupport.jar.%{bldno} %{buildroot}%{prefix}/share/java/CasaJaasSupport.jar -ln -sf CasaJaasSupport.jar.%{bldno} %{buildroot}%{prefix}/share/java/CasaJaasSupport.jar.1 -ln -sf CasaAuthToken.jar.%{bldno} %{buildroot}%{prefix}/share/java/CasaAuthToken.jar -ln -sf CasaAuthToken.jar.%{bldno} %{buildroot}%{prefix}/share/java/CasaAuthToken.jar.1 - -## CASA-auth-token-devel ## -# Header Files -install -m 644 include/casa_c_authtoken.h %{buildroot}%{prefix}/include -install -m 644 include/casa_s_authtoken.h %{buildroot}%{prefix}/include - - -%clean -rm -rf $RPM_BUILD_ROOT - - -## CASA-auth-token-service ## -%pre -# Nothing to do in this pre script - -%post -/sbin/ldconfig - -%preun -# Nothing to do in this preun script - -%postun -# Nothing to do in this postun script - -%files -%defattr(-,root,root) -%{prefix}/share/java/CasaAuthTokenSvc.war.%{bldno} -%{prefix}/share/java/CasaAuthTokenSvc.war -%{prefix}/share/java/CasaAuthTokenSvc.war.1 - - -## CASA-auth-token-server-support ## -%pre -n CASA-auth-token-server-support -# Nothing to do in this pre script - -%post -n CASA-auth-token-server-support -/sbin/ldconfig - -%preun -n CASA-auth-token-server-support -# Nothing to do in this preun script - -%postun -n CASA-auth-token-server-support -# Nothing to do in this postun script - -%files -n CASA-auth-token-server-support -%defattr(-,root,root) -%{prefix}/%{_lib}/libcasa_s_authtoken.so.%{bldno} -%{prefix}/%{_lib}/libcasa_s_authtoken.so -%{prefix}/%{_lib}/libcasa_s_authtoken.so.1 - - -## CASA-auth-token-pam-support ## -%pre -n CASA-auth-token-pam-support -# Nothing to do in this pre script - -%post -n CASA-auth-token-pam-support -/sbin/ldconfig - -%preun -n CASA-auth-token-pam-support -# Nothing to do in this preun script - -%postun -n CASA-auth-token-pam-support -# Nothing to do in this postun script - -%files -n CASA-auth-token-pam-support -%defattr(-,root,root) -%dir %{prefix}/%{_lib}/security -%{prefix}/%{_lib}/security/pam_casaauthtok.so.%{bldno} -%{prefix}/%{_lib}/security/pam_casaauthtok.so -%{prefix}/%{_lib}/security/pam_casaauthtok.so.1 - - -## CASA-auth-token-apache2_2-support ## -%pre -n CASA-auth-token-apache2_2-support -# Nothing to do in this pre script - -%post -n CASA-auth-token-apache2_2-support -/sbin/ldconfig - -%preun -n CASA-auth-token-apache2_2-support -# Nothing to do in this preun script - -%postun -n CASA-auth-token-apache2_2-support -# Nothing to do in this postun script - -%files -n CASA-auth-token-apache2_2-support -%defattr(-,root,root) -%{prefix}/%{_lib}/mod_authn_casa.so.%{bldno} -%{prefix}/%{_lib}/mod_authn_casa.so -%{prefix}/%{_lib}/mod_authn_casa.so.1 - - -## CASA-auth-token-jaas-support ## -%pre -n CASA-auth-token-jaas-support -# Nothing to do in this pre script - -%post -n CASA-auth-token-jaas-support -/sbin/ldconfig - -%preun -n CASA-auth-token-jaas-support -# Nothing to do in this preun script - -%postun -n CASA-auth-token-jaas-support -# Nothing to do in this postun script - -%files -n CASA-auth-token-jaas-support -%defattr(-,root,root) -%{prefix}/share/java/CasaJaasSupport.jar.%{bldno} -%{prefix}/share/java/CasaJaasSupport.jar -%{prefix}/share/java/CasaJaasSupport.jar.1 -%{prefix}/share/java/CasaAuthToken.jar.%{bldno} -%{prefix}/share/java/CasaAuthToken.jar -%{prefix}/share/java/CasaAuthToken.jar.1 - - -## CASA-auth-token-devel ## -%pre -n CASA-auth-token-devel -# Nothing to do in this pre script - -%post -n CASA-auth-token-devel -# Nothing to do in this post script - -%preun -n CASA-auth-token-devel -# Nothing to do in this preun script - -%postun -n CASA-auth-token-devel -# Nothing to do in this postun script - -%files -n CASA-auth-token-devel -%defattr(-,root,root) -%{prefix}/include/casa_c_authtoken.h -%{prefix}/include/casa_s_authtoken.h - -%changelog -n CASA-auth-token diff --git a/CASA-auth-token/java/package/linux/CASA_auth_token_svc.spec.in b/CASA-auth-token/java/package/linux/CASA_auth_token_svc.spec.in new file mode 100644 index 00000000..869516c9 --- /dev/null +++ b/CASA-auth-token/java/package/linux/CASA_auth_token_svc.spec.in @@ -0,0 +1,163 @@ +# +# spec file for the CASA_auth_token java packages. +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org +# + +# norootforbuild + +# For debug build, please replace Release to Debug and set debug_opt to --enable-debug +%define cfg Release +%define debug_opt "" + + +Name: @PACKAGE@ +URL: http://www.novell.com/products +BuildRequires: libstdc++ libgcc gcc-c++ glib2-devel libstdc++-devel pkgconfig java-1_5_0-ibm-devel update-alternatives mono-devel servletapi5 identity-abstraction +%define prefix /usr +License: LGPL +Group: Applications/System +Autoreqprov: on +%define bldno 1.0.0 +Version: @VERSION@ +Release: 0 +Summary: Novell Common Authentication Services Adapter Authentication Token Infrastructure "Java" (CASA_auth_token) +Source: %{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: java-1_5_0-ibm servletapi5 tomcat5 +PreReq: %fillup_prereq %insserv_prereq +BuildArchitectures: noarch + +%description +CASA_auth_token is an authentication token infrastructure with support for multiple +authentication mechanisms with an emphasis on providing a scalable single +sign-on solution. + +A key feature of CASA_auth_token is that its authentication tokens contain identity +information about the entity being authenticated. This information is made available +to the consuming services. The amount of information contained in the tokens is +configured on a per-service basis. Because of this feature, we say that CASA_auth_token +projects an "Authenticated Identity". + +The CASA_auth_token_svc is the infrastructure component responsible for authenticating +entities using the native authentication mechanism and for issuing tokens that can later +be used by applications to authenticate the entity o services that are CASA authentication +enabled. + +%package -n CASA_auth_token_jaas-support +Summary: Libraries needed for JAAS applications development. +Group: Applications/System +Requires: java-1_5_0-ibm + +%description -n CASA_auth_token_jaas-support +CASA_auth_token is an authentication token infrastructure with support for multiple +authentication mechanisms with an emphasis on providing a scalable single +sign-on solution. + +A key feature of CASA_auth_token is that its authentication tokens contain identity +information about the entity being authenticated. This information is made available +to the consuming services. The amount of information contained in the tokens is +configured on a per-service basis. Because of this feature, we say that CASA_auth_token +projects an "Authenticated Identity". + +The CASA_auth_token_jaas-support package contains the CASA (Common Authentication +Services Adapter) authentication token infrastructure JAAS module and supporting libraries +for token verification. + +%prep +%setup -q +#%patch +%if %{_lib} == "lib64" +%define binsource bin64 +%else +%define binsource bin +%endif + +%build +export PATH=.:$PATH:/usr/%_lib/qt3/bin +%if %suse_version > 1000 +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fstack-protector" +%endif + +./autogen.sh +make + + +%install + +## Prime the file system ## +install -d %{buildroot}%{prefix} +install -d %{buildroot}%{prefix}/share +install -d %{buildroot}%{prefix}/share/java + +## CASA_auth_token_svc ## +# Libs +install -m 755 %{_lib}/java/CasaAuthTokenSvc.war %{buildroot}%{prefix}/share/java/CasaAuthTokenSvc-%{bldno}.war + +# Lib Symbolic Links +ln -sf CasaAuthTokenSvc-%{bldno}.war %{buildroot}%{prefix}/share/java/CasaAuthTokenSvc.war +ln -sf CasaAuthTokenSvc-%{bldno}.war %{buildroot}%{prefix}/share/java/CasaAuthTokenSvc.war.1 + +## CASA_auth_token_jaas-support ## +# Libs +install -m 755 %{_lib}/java/CasaJaasSupport.jar %{buildroot}%{prefix}/share/java/CasaJaasSupport-%{bldno}.jar +install -m 755 %{_lib}/java/CasaAuthToken.jar %{buildroot}%{prefix}/share/java/CasaAuthToken-%{bldno}.jar + +# Lib Symbolic Links +ln -sf CasaJaasSupport-%{bldno}.jar %{buildroot}%{prefix}/share/java/CasaJaasSupport.jar +ln -sf CasaJaasSupport-%{bldno}.jar %{buildroot}%{prefix}/share/java/CasaJaasSupport.jar.1 +ln -sf CasaAuthToken-%{bldno}.jar %{buildroot}%{prefix}/share/java/CasaAuthToken.jar +ln -sf CasaAuthToken-%{bldno}.jar %{buildroot}%{prefix}/share/java/CasaAuthToken.jar.1 + +%clean +rm -rf $RPM_BUILD_ROOT + + +## CASA_auth_token_svc ## +%pre +# Nothing to do in this pre script + +%post +/sbin/ldconfig + +%preun +# Nothing to do in this preun script + +%postun +# Nothing to do in this postun script + +%files +%defattr(-,root,root) +%{prefix}/share/java/CasaAuthTokenSvc-%{bldno}.war +%{prefix}/share/java/CasaAuthTokenSvc.war +%{prefix}/share/java/CasaAuthTokenSvc.war.1 + + +## CASA_auth_token_jaas-support ## +%pre -n CASA_auth_token_jaas-support +# Nothing to do in this pre script + +%post -n CASA_auth_token_jaas-support +/sbin/ldconfig + +%preun -n CASA_auth_token_jaas-support +# Nothing to do in this preun script + +%postun -n CASA_auth_token_jaas-support +# Nothing to do in this postun script + +%files -n CASA_auth_token_jaas-support +%defattr(-,root,root) +%{prefix}/share/java/CasaJaasSupport-%{bldno}.jar +%{prefix}/share/java/CasaJaasSupport.jar +%{prefix}/share/java/CasaJaasSupport.jar.1 +%{prefix}/share/java/CasaAuthToken-%{bldno}.jar +%{prefix}/share/java/CasaAuthToken.jar +%{prefix}/share/java/CasaAuthToken.jar.1 + + +%changelog -n package diff --git a/CASA-auth-token/java/package/linux/Makefile.am b/CASA-auth-token/java/package/linux/Makefile.am index 7eaa5b7f..095afe6b 100644 --- a/CASA-auth-token/java/package/linux/Makefile.am +++ b/CASA-auth-token/java/package/linux/Makefile.am @@ -23,7 +23,7 @@ RPM_FILE = $(PACKAGE)-$(VERSION)-$(RELEASE).$(target_cpu).rpm #SRPM_FILE = $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm SRPM_FILE = $(PACKAGE)-$(VERSION)*.src.rpm -SPEC_FILE = CASA-auth-token-service.spec +SPEC_FILE = CASA_auth_token_svc.spec .PHONY: package package-clean package-install package-uninstall casa diff --git a/CASA-auth-token/java/server/JaasSupport/.classpath b/CASA-auth-token/java/server/Jaas/.classpath similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/.classpath rename to CASA-auth-token/java/server/Jaas/.classpath diff --git a/CASA-auth-token/java/server/JaasSupport/.project b/CASA-auth-token/java/server/Jaas/.project similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/.project rename to CASA-auth-token/java/server/Jaas/.project diff --git a/CASA-auth-token/java/server/JaasSupport/Makefile.am b/CASA-auth-token/java/server/Jaas/Makefile.am similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/Makefile.am rename to CASA-auth-token/java/server/Jaas/Makefile.am diff --git a/CASA-auth-token/java/server/JaasSupport/README b/CASA-auth-token/java/server/Jaas/README similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/README rename to CASA-auth-token/java/server/Jaas/README diff --git a/CASA-auth-token/java/server/JaasSupport/TODO b/CASA-auth-token/java/server/Jaas/TODO similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/TODO rename to CASA-auth-token/java/server/Jaas/TODO diff --git a/CASA-auth-token/java/server/JaasSupport/make_and_run_test.sh b/CASA-auth-token/java/server/Jaas/make_and_run_test.sh similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/make_and_run_test.sh rename to CASA-auth-token/java/server/Jaas/make_and_run_test.sh diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/Makefile.am b/CASA-auth-token/java/server/Jaas/src/Makefile.am similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/Makefile.am rename to CASA-auth-token/java/server/Jaas/src/Makefile.am diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/Makefile.am b/CASA-auth-token/java/server/Jaas/src/com/Makefile.am similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/Makefile.am rename to CASA-auth-token/java/server/Jaas/src/com/Makefile.am diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/Makefile.am b/CASA-auth-token/java/server/Jaas/src/com/novell/Makefile.am similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/Makefile.am rename to CASA-auth-token/java/server/Jaas/src/com/novell/Makefile.am diff --git a/CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/Makefile.am b/CASA-auth-token/java/server/Jaas/src/com/novell/casa/Makefile.am similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/Makefile.am rename to CASA-auth-token/java/server/Jaas/src/com/novell/casa/Makefile.am diff --git a/CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/jaas/CasaLoginModule.java b/CASA-auth-token/java/server/Jaas/src/com/novell/casa/jaas/CasaLoginModule.java similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/jaas/CasaLoginModule.java rename to CASA-auth-token/java/server/Jaas/src/com/novell/casa/jaas/CasaLoginModule.java diff --git a/CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/jaas/CasaPrincipal.java b/CASA-auth-token/java/server/Jaas/src/com/novell/casa/jaas/CasaPrincipal.java similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/jaas/CasaPrincipal.java rename to CASA-auth-token/java/server/Jaas/src/com/novell/casa/jaas/CasaPrincipal.java diff --git a/CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/jaas/Makefile.am b/CASA-auth-token/java/server/Jaas/src/com/novell/casa/jaas/Makefile.am similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/jaas/Makefile.am rename to CASA-auth-token/java/server/Jaas/src/com/novell/casa/jaas/Makefile.am diff --git a/CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleApp.conf b/CASA-auth-token/java/server/Jaas/src/com/novell/casa/jaas/sample/SampleApp.conf similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleApp.conf rename to CASA-auth-token/java/server/Jaas/src/com/novell/casa/jaas/sample/SampleApp.conf diff --git a/CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleApp.java b/CASA-auth-token/java/server/Jaas/src/com/novell/casa/jaas/sample/SampleApp.java similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleApp.java rename to CASA-auth-token/java/server/Jaas/src/com/novell/casa/jaas/sample/SampleApp.java diff --git a/CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleAppCallbackHandler.java b/CASA-auth-token/java/server/Jaas/src/com/novell/casa/jaas/sample/SampleAppCallbackHandler.java similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleAppCallbackHandler.java rename to CASA-auth-token/java/server/Jaas/src/com/novell/casa/jaas/sample/SampleAppCallbackHandler.java diff --git a/CASA-auth-token/java/server/Makefile.am b/CASA-auth-token/java/server/Makefile.am index 58613019..40f31ead 100644 --- a/CASA-auth-token/java/server/Makefile.am +++ b/CASA-auth-token/java/server/Makefile.am @@ -20,10 +20,9 @@ # ####################################################################### -#SUBDIRS = AuthTokenValidate ApacheSupport PamSupport -SUBDIRS = AuthTokenValidate ApacheSupport PamSupport AuthTokenSvc JaasSupport +SUBDIRS = Svc Jaas -DIST_SUBDIRS = AuthTokenValidate ApacheSupport PamSupport AuthTokenSvc JaasSupport +DIST_SUBDIRS = Svc Jaas CFILES = diff --git a/CASA-auth-token/java/server/AuthTokenSvc/.project b/CASA-auth-token/java/server/Svc/.project similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/.project rename to CASA-auth-token/java/server/Svc/.project diff --git a/CASA-auth-token/java/server/AuthTokenSvc/Makefile.am b/CASA-auth-token/java/server/Svc/Makefile.am similarity index 93% rename from CASA-auth-token/java/server/AuthTokenSvc/Makefile.am rename to CASA-auth-token/java/server/Svc/Makefile.am index 74d7ce0b..57fd41d1 100644 --- a/CASA-auth-token/java/server/AuthTokenSvc/Makefile.am +++ b/CASA-auth-token/java/server/Svc/Makefile.am @@ -33,8 +33,10 @@ ROOT = ../.. LIBDIR = $(ROOT)/$(LIB) -IDENT_ABSTRACTION_DIR = /usr/share/java/identity-abstraction -IDENT_ABSTRACTION_DEPENDANCIES_DIR = /usr/share/java/identity-abstraction/dependancies +#IDENT_ABSTRACTION_DIR = /usr/share/java/identity-abstraction +#IDENT_ABSTRACTION_DEPENDANCIES_DIR = /usr/share/java/identity-abstraction/dependancies +IDENT_ABSTRACTION_DIR = /usr/share/java/identity-abstraction-0.1.145 +IDENT_ABSTRACTION_DEPENDANCIES_DIR = /usr/share/java/identity-abstraction-0.1.145 JAVAROOT = . JAVAC= javac @@ -79,7 +81,8 @@ AUTHTOKEN_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class)) LIBS = /usr/share/java/servletapi5.jar -CLASSPATH = $(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(LIBS) +#CLASSPATH = $(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(LIBS) +CLASSPATH = $(IDENT_ABSTRACTION_DIR)/identity-abstraction-0.1.145.jar:$(LIBS) CUR_DIR := $(shell pwd) diff --git a/CASA-auth-token/java/server/AuthTokenSvc/README b/CASA-auth-token/java/server/Svc/README similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/README rename to CASA-auth-token/java/server/Svc/README diff --git a/CASA-auth-token/java/server/AuthTokenSvc/TODO b/CASA-auth-token/java/server/Svc/TODO similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/TODO rename to CASA-auth-token/java/server/Svc/TODO diff --git a/CASA-auth-token/java/server/AuthTokenSvc/authtoken.settings b/CASA-auth-token/java/server/Svc/authtoken.settings similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/authtoken.settings rename to CASA-auth-token/java/server/Svc/authtoken.settings diff --git a/CASA-auth-token/java/server/AuthTokenSvc/identoken.settings b/CASA-auth-token/java/server/Svc/identoken.settings similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/identoken.settings rename to CASA-auth-token/java/server/Svc/identoken.settings diff --git a/CASA-auth-token/java/server/AuthTokenSvc/sampleConf/auth.policy b/CASA-auth-token/java/server/Svc/sampleConf/auth.policy similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/sampleConf/auth.policy rename to CASA-auth-token/java/server/Svc/sampleConf/auth.policy diff --git a/CASA-auth-token/java/server/AuthTokenSvc/sampleConf/auth_mechanisms/Krb5Authenticate/mechanism.settings b/CASA-auth-token/java/server/Svc/sampleConf/auth_mechanisms/Krb5Authenticate/mechanism.settings similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/sampleConf/auth_mechanisms/Krb5Authenticate/mechanism.settings rename to CASA-auth-token/java/server/Svc/sampleConf/auth_mechanisms/Krb5Authenticate/mechanism.settings diff --git a/CASA-auth-token/java/server/AuthTokenSvc/sampleConf/auth_mechanisms/PwdAuthenticate/mechanism.settings b/CASA-auth-token/java/server/Svc/sampleConf/auth_mechanisms/PwdAuthenticate/mechanism.settings similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/sampleConf/auth_mechanisms/PwdAuthenticate/mechanism.settings rename to CASA-auth-token/java/server/Svc/sampleConf/auth_mechanisms/PwdAuthenticate/mechanism.settings diff --git a/CASA-auth-token/java/server/AuthTokenSvc/sampleConf/authtoken.settings b/CASA-auth-token/java/server/Svc/sampleConf/authtoken.settings similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/sampleConf/authtoken.settings rename to CASA-auth-token/java/server/Svc/sampleConf/authtoken.settings diff --git a/CASA-auth-token/java/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/auth.policy b/CASA-auth-token/java/server/Svc/sampleConf/enabled_services/appserver.companyname.com/testService/auth.policy similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/auth.policy rename to CASA-auth-token/java/server/Svc/sampleConf/enabled_services/appserver.companyname.com/testService/auth.policy diff --git a/CASA-auth-token/java/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/authtoken.settings b/CASA-auth-token/java/server/Svc/sampleConf/enabled_services/appserver.companyname.com/testService/authtoken.settings similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/authtoken.settings rename to CASA-auth-token/java/server/Svc/sampleConf/enabled_services/appserver.companyname.com/testService/authtoken.settings diff --git a/CASA-auth-token/java/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings b/CASA-auth-token/java/server/Svc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings rename to CASA-auth-token/java/server/Svc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings diff --git a/CASA-auth-token/java/server/AuthTokenSvc/sampleConf/iaRealms.xml b/CASA-auth-token/java/server/Svc/sampleConf/iaRealms.xml similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/sampleConf/iaRealms.xml rename to CASA-auth-token/java/server/Svc/sampleConf/iaRealms.xml diff --git a/CASA-auth-token/java/server/AuthTokenSvc/sampleConf/identoken.settings b/CASA-auth-token/java/server/Svc/sampleConf/identoken.settings similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/sampleConf/identoken.settings rename to CASA-auth-token/java/server/Svc/sampleConf/identoken.settings diff --git a/CASA-auth-token/java/server/AuthTokenSvc/sampleConf/svc.settings b/CASA-auth-token/java/server/Svc/sampleConf/svc.settings similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/sampleConf/svc.settings rename to CASA-auth-token/java/server/Svc/sampleConf/svc.settings diff --git a/CASA-auth-token/java/server/JaasSupport/src/Makefile.am b/CASA-auth-token/java/server/Svc/src/Makefile.am similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/src/Makefile.am rename to CASA-auth-token/java/server/Svc/src/Makefile.am diff --git a/CASA-auth-token/java/server/JaasSupport/src/com/Makefile.am b/CASA-auth-token/java/server/Svc/src/com/Makefile.am similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/src/com/Makefile.am rename to CASA-auth-token/java/server/Svc/src/com/Makefile.am diff --git a/CASA-auth-token/java/server/JaasSupport/src/com/novell/Makefile.am b/CASA-auth-token/java/server/Svc/src/com/novell/Makefile.am similarity index 100% rename from CASA-auth-token/java/server/JaasSupport/src/com/novell/Makefile.am rename to CASA-auth-token/java/server/Svc/src/com/novell/Makefile.am diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/Makefile.am b/CASA-auth-token/java/server/Svc/src/com/novell/casa/Makefile.am similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/Makefile.am rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/Makefile.am diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthMechConfig.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/AuthMechConfig.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthMechConfig.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/AuthMechConfig.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthMechanism.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/AuthMechanism.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthMechanism.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/AuthMechanism.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthReqMsg.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/AuthReqMsg.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthReqMsg.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/AuthReqMsg.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthRespMsg.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/AuthRespMsg.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthRespMsg.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/AuthRespMsg.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthToken.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/AuthToken.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthToken.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/AuthToken.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthTokenConfig.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/AuthTokenConfig.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthTokenConfig.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/AuthTokenConfig.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Authenticate.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Authenticate.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Authenticate.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Authenticate.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Base64Coder.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Base64Coder.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Base64Coder.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Base64Coder.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicy.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicy.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicy.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicy.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicyRespMsg.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicyRespMsg.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicyRespMsg.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicyRespMsg.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthTokRespMsg.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/GetAuthTokRespMsg.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthTokRespMsg.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/GetAuthTokRespMsg.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthToken.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/GetAuthToken.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthToken.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/GetAuthToken.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/IdenTokenConfig.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/IdenTokenConfig.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/IdenTokenConfig.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/IdenTokenConfig.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/IdentityToken.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/IdentityToken.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/IdentityToken.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/IdentityToken.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Makefile.am b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Makefile.am similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Makefile.am rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Makefile.am diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/ProtoDefs.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/ProtoDefs.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/ProtoDefs.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/ProtoDefs.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Rpc.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Rpc.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Rpc.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/Rpc.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/RpcMethod.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/RpcMethod.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/RpcMethod.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/RpcMethod.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/SessionToken.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/SessionToken.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/SessionToken.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/SessionToken.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/SvcConfig.java b/CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/SvcConfig.java similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/SvcConfig.java rename to CASA-auth-token/java/server/Svc/src/com/novell/casa/authtoksvc/SvcConfig.java diff --git a/CASA-auth-token/java/server/AuthTokenSvc/svc.settings b/CASA-auth-token/java/server/Svc/svc.settings similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/svc.settings rename to CASA-auth-token/java/server/Svc/svc.settings diff --git a/CASA-auth-token/java/server/AuthTokenSvc/web.xml b/CASA-auth-token/java/server/Svc/web.xml similarity index 100% rename from CASA-auth-token/java/server/AuthTokenSvc/web.xml rename to CASA-auth-token/java/server/Svc/web.xml