perfsonar development work

Author: rodriguez
Date: 2007-05-31 11:25:51 -0400 (Thu, 31 May 2007)
New Revision: 2444

Added:
   branches/as/ant/as/
   branches/as/ant/as/build-targets.xml
   branches/as/ant/as/client-run-targets.xml
   branches/as/ant/as/configure-targets.xml
   branches/as/ant/as/deploy-targets.xml
   branches/as/ant/as/libs-download-targets.xml
   branches/as/ant/as/pre-install-targets.xml
   branches/as/ant/as/release-targets.xml
   branches/as/ant/as/test-run-targets.xml
   branches/as/ant/as/undeploy-targets.xml
   branches/as/ant/build-as.xml
   branches/as/ant/const.properties.as
   branches/as/conf/ASValidComponentsFile
   branches/as/conf/components.properties.as
   branches/as/conf/perfSONARtruststore.jks
   branches/as/conf/service.properties.as
   branches/as/conf/test-eduGAIN.key
   branches/as/conf/test-eduGAIN.pem
   branches/as/conf/wsdd/as-service-deploy.wsdd
   branches/as/conf/wsdd/as-service-undeploy.wsdd
   branches/as/lib/misc/edugain-0.5.jar
   branches/as/lib/misc/opensaml-1.1.jar
   branches/as/schema/example-instances/perfSONAR/AS/
   branches/as/schema/example-instances/perfSONAR/AS/test/
   branches/as/schema/example-instances/perfSONAR/AS/test/AuthNRequest.xml
   branches/as/src/org/perfsonar/commons/messages/AuthNClient.java
   branches/as/src/org/perfsonar/service/authService/
   branches/as/src/org/perfsonar/service/authService/ASAction.java
   branches/as/src/org/perfsonar/service/authService/ASEngine.java
   branches/as/src/org/perfsonar/service/authService/AuthNAction.java
Removed:
   branches/as/src/org/perfsonar/service/commons/authn/AADispatchManager.java
   branches/as/src/org/perfsonar/service/commons/authn/AADispatchProtocol.java
   
branches/as/src/org/perfsonar/service/commons/authn/AADispatchProtocolFactory.java
   
branches/as/src/org/perfsonar/service/commons/authn/AADispatchSOAPProtocol.java
   branches/as/src/org/perfsonar/service/commons/authn/AuthNRequest.java
   branches/as/src/org/perfsonar/service/commons/authn/AuthNResponse.java
   
branches/as/src/org/perfsonar/service/commons/authn/tokens/SecTokenManager.java
   
branches/as/src/org/perfsonar/service/commons/authn/tokens/SecTokenManagerFactory.java
   
branches/as/src/org/perfsonar/service/commons/authn/tokens/SecTokenSOAPManager.java
   
branches/as/src/org/perfsonar/service/commons/authn/tokens/SecurityToken.java
Modified:
   branches/as/ant/axis-deploy-targets.xml
   branches/as/conf/log4j.properties
   branches/as/src/org/perfsonar/service/commons/engine/ActionType.java
Log:
Updating the AS code

Added: branches/as/ant/as/build-targets.xml

Added: branches/as/ant/as/client-run-targets.xml

Added: branches/as/ant/as/configure-targets.xml

Added: branches/as/ant/as/deploy-targets.xml

Added: branches/as/ant/as/libs-download-targets.xml

Added: branches/as/ant/as/pre-install-targets.xml

Added: branches/as/ant/as/release-targets.xml

Added: branches/as/ant/as/test-run-targets.xml

Added: branches/as/ant/as/undeploy-targets.xml

Modified: branches/as/ant/axis-deploy-targets.xml
===================================================================
--- branches/as/ant/axis-deploy-targets.xml     2007-05-31 13:39:13 UTC (rev 
2443)
+++ branches/as/ant/axis-deploy-targets.xml     2007-05-31 15:25:51 UTC (rev 
2444)
@@ -91,6 +91,9 @@
 
         <copy file="./lib/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar"      
                  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
+        <copy file="./lib/repository/wss4j/wss4j/1.5.1/wss4j-1.5.1.jar"      
                  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/xml-security/xmlsec/1.3.0/xmlsec-1.3.0.jar"            
   todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+
     </target>
 
 
@@ -318,4 +321,4 @@
 
 
 
-</project>
\ No newline at end of file
+</project>

Added: branches/as/ant/build-as.xml

Added: branches/as/ant/const.properties.as

Added: branches/as/conf/ASValidComponentsFile

Added: branches/as/conf/components.properties.as

Modified: branches/as/conf/log4j.properties
===================================================================
--- branches/as/conf/log4j.properties   2007-05-31 13:39:13 UTC (rev 2443)
+++ branches/as/conf/log4j.properties   2007-05-31 15:25:51 UTC (rev 2444)
@@ -1,50 +1,64 @@
-#This file was created by the ant script.
-#Wed Dec 06 19:54:26 CET 2006
-log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-log4j.appender.debugAppender.MaxBackupIndex=1000
-log4j.appender.infoAppender.MaxBackupIndex=1000
-log4j.appender.warnAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_warn.log
-log4j.appender.warnAppender.MaxBackupIndex=1000
-log4j.appender.debugAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_debug.log
+
+## $Id$
+## Project: perfSONAR
+
+
+
+# needs to be adjusted by service deployer
+logDir=/Users/kan/Proyectos/RedIRIS/perfSONAR/tomcat-5.5.20/webapps/perfSONAR-AS/WEB-INF/logs
+
+
+log4j.rootLogger=INFO, rootAppender
+log4j.logger.sonar-debug=DEBUG, debugAppender
+log4j.logger.sonar-info=INFO, infoAppender
+log4j.logger.sonar-warn=WARN, warnAppender
+log4j.logger.sonar-error=ERROR, errorAppender
+log4j.logger.sonar-fatal=FATAL, fatalAppender
+
+
+log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.rootAppender.File=${logDir}/sonar.log
+log4j.appender.rootAppender.MaxFileSize=500KB
 log4j.appender.rootAppender.MaxBackupIndex=1000
-log4j.appender.rootAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar.log
 log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.rootAppender.layout.ConversionPattern=%p: 
%m%n----------------------\n
+
+log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.debugAppender.File=${logDir}/sonar_debug.log
 log4j.appender.debugAppender.MaxFileSize=500KB
-log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
-log4j.logger.sonar-warn=WARN, warnAppender
-log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-logDir=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log
-log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.errorAppender.MaxBackupIndex=1000
-log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.debugAppender.MaxBackupIndex=100
+log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
+## log4j.appender.debugAppender.layout.ConversionPattern=%p: 
%m%n----------------------\n
+log4j.appender.debugAppender.layout.ConversionPattern=%p: 
%m%n----------------------\n
+
+log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.infoAppender.File=${logDir}/sonar_info.log
+log4j.appender.infoAppender.MaxFileSize=500KB
+log4j.appender.infoAppender.MaxBackupIndex=100
+log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.infoAppender.layout.ConversionPattern=%p: 
%m%n----------------------\n
+
+log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.warnAppender.File=${logDir}/sonar_warn.log
 log4j.appender.warnAppender.MaxFileSize=500KB
-log4j.rootLogger=INFO, rootAppender
-log4j.appender.rootAppender.MaxFileSize=500KB
-log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.fatalAppender.MaxBackupIndex=1000
+log4j.appender.warnAppender.MaxBackupIndex=100
 log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.errorAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_error.log
+log4j.appender.warnAppender.layout.ConversionPattern=%p: 
%m%n----------------------\n
+
+log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.errorAppender.File=${logDir}/sonar_error.log
 log4j.appender.errorAppender.MaxFileSize=500KB
-log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-log4j.logger.perfsonar-info=INFO, infoAppender
-log4j.appender.fatalAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_fatal.log
-log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.errorAppender.MaxBackupIndex=100
+log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.errorAppender.layout.ConversionPattern=%p: 
%m%n----------------------\n
+
+log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.fatalAppender.File=${logDir}/sonar_fatal.log
 log4j.appender.fatalAppender.MaxFileSize=500KB
-log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-log4j.logger.sonar-debug=DEBUG, debugAppender
-log4j.logger.perfsonar-debug=DEBUG, debugAppender
-log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-log4j.logger.sonar-error=ERROR, errorAppender
-log4j.logger.perfsonar-error=ERROR, errorAppender
-log4j.logger.perfsonar-warn=WARN, warnAppender
-log4j.logger.sonar-info=INFO, infoAppender
-log4j.appender.infoAppender.MaxFileSize=500KB
-log4j.appender.infoAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_info.log
-log4j.logger.sonar-fatal=FATAL, fatalAppender
-log4j.logger.perfsonar-fatal=FATAL, fatalAppender
+log4j.appender.fatalAppender.MaxBackupIndex=100
+log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.fatalAppender.layout.ConversionPattern=%p: 
%m%n----------------------\n
+
+
+
+

Added: branches/as/conf/perfSONARtruststore.jks


Property changes on: branches/as/conf/perfSONARtruststore.jks
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/as/conf/service.properties.as

Added: branches/as/conf/test-eduGAIN.key

Added: branches/as/conf/test-eduGAIN.pem

Added: branches/as/conf/wsdd/as-service-deploy.wsdd

Added: branches/as/conf/wsdd/as-service-undeploy.wsdd

Added: branches/as/lib/misc/edugain-0.5.jar


Property changes on: branches/as/lib/misc/edugain-0.5.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/as/lib/misc/opensaml-1.1.jar


Property changes on: branches/as/lib/misc/opensaml-1.1.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/as/schema/example-instances/perfSONAR/AS/test/AuthNRequest.xml

Added: branches/as/src/org/perfsonar/commons/messages/AuthNClient.java

Added: branches/as/src/org/perfsonar/service/authService/ASAction.java

Added: branches/as/src/org/perfsonar/service/authService/ASEngine.java

Added: branches/as/src/org/perfsonar/service/authService/AuthNAction.java

Deleted: 
branches/as/src/org/perfsonar/service/commons/authn/AADispatchManager.java

Deleted: 
branches/as/src/org/perfsonar/service/commons/authn/AADispatchProtocol.java

Deleted: 
branches/as/src/org/perfsonar/service/commons/authn/AADispatchProtocolFactory.java

Deleted: 
branches/as/src/org/perfsonar/service/commons/authn/AADispatchSOAPProtocol.java

Deleted: branches/as/src/org/perfsonar/service/commons/authn/AuthNRequest.java

Deleted: 
branches/as/src/org/perfsonar/service/commons/authn/AuthNResponse.java

Deleted: 
branches/as/src/org/perfsonar/service/commons/authn/tokens/SecTokenManager.java

Deleted: 
branches/as/src/org/perfsonar/service/commons/authn/tokens/SecTokenManagerFactory.java

Deleted: 
branches/as/src/org/perfsonar/service/commons/authn/tokens/SecTokenSOAPManager.java

Deleted: 
branches/as/src/org/perfsonar/service/commons/authn/tokens/SecurityToken.java

Modified: branches/as/src/org/perfsonar/service/commons/engine/ActionType.java
===================================================================
--- branches/as/src/org/perfsonar/service/commons/engine/ActionType.java      
  2007-05-31 13:39:13 UTC (rev 2443)
+++ branches/as/src/org/perfsonar/service/commons/engine/ActionType.java      
  2007-05-31 15:25:51 UTC (rev 2444)
@@ -46,13 +46,13 @@
 
     /**
      *  Action type to request a measurement
-     */    
+     */
     public static final String LS_REGISTER = "LS_REGISTER";
 
 
     /**
      *  Action type to request a measurement
-     */    
+     */
     public static final String LS_LOOKUP = "LS_LOOKUP";
 
 
@@ -72,8 +72,8 @@
 
     public static final String ECHO = "ECHO";
 
-    
-    
+
+
     // ------------------------------------------ Measurement Point Actions
 
 
@@ -93,4 +93,11 @@
 
     public static final String SETUP_DATA_DB = "SETUP_DATA_DB";
 
+    // ------------------------------------------ Authentication Service 
Actions
+
+    /**
+     * Action type to request the authentication of the client/user
+     */
+
+    public static final String AUTHN_CLIENT = "AuthNClient";
 }