Move stand-alone java examples to client-java module, build and install the examples.

diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index 890b4d2..464f643 100644 (file)
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -1,21 +1,28 @@
 -include Makefile.inc
 
 # broken 
-# SimpleLLTest.class ProducerTestLL.class ProducerTestIL.class
+# SimpleLLTest.class ProducerTestLL.class ProducerTestIL.class CreamTest.java
 
-EXAMPLES := SSLClient.class SSLServer.class QueryDemo.class NotificationExample.class CreamTest.class
+FULL_EXAMPLES := $(addprefix examples/,SSLClient.java SSLServer.java QueryDemo.java NotificationExample.java)
+SSL_EXAMPLES := $(addprefix examples/simple-ssl/,MyX509KeyManager.java MyX509TrustManager.java ExampleSSLSocketFactory.java LBClientSSL.java)
+TM_EXAMPLES := $(addprefix examples/simple-trustmanager/,LBClientTM.java)
 
-VPATH := examples
+VPATH := examples examples/simple-ssl examples/simple-trustmanager
 
 JAVAC:=${jdk_prefix}/bin/javac
 JAVAH:=${jdk_prefix}/bin/javah
 JAVA:=${jdk_prefix}/bin/java
 
-all compile: genevents genws compile-java build-jar build-c
+GEN:=${stagedir}/sbin/glite-lb-at3 project/genEventTypes.pl
+AT3DIR:=${stagedir}/share/lb/at3
+axis_classpath:=$(shell ls ${axis_prefix}/lib/*.jar | tr '\012' :)
+trustmanager_classpath:=${trustmanager_prefix}/share/java/glite-security-trustmanager.jar
+
+all compile: genevents genws compile-java build-jar examples build-c
 
 compile-java:
        ${JAVAC} \
-               -classpath ${commons-lang_jar}:${stagedir}/share/java/jobid-api-java.jar:${trustmanager_prefix}/share/java/glite-security-trustmanager.jar:${utiljava_prefix}/share/java/glite-security-util-java.jar:`ls ${axis_prefix}/lib/*.jar | tr '\012' :` \
+               -classpath ${commons-lang_jar}:${stagedir}/share/java/jobid-api-java.jar:${trustmanager_classpath}:${utiljava_prefix}/share/java/glite-security-util-java.jar:${axis_classpath} \
                -d build \
                src/org/glite/lb/*.java \
                build/gen/*.java \
@@ -27,9 +34,10 @@ compile-java:
                build/axis/org/glite/wsdl/elements/lb/*.java \
                build/axis/holders/StringArrayHolder.java
 
-build-jar:
-       cd build && ${jdk_prefix}/bin/jar cf lb-client-java.jar holders org
+build-jar: lb-client-java.jar
 
+lb-client-java.jar:
+       cd build && ${jdk_prefix}/bin/jar cf lb-client-java.jar holders org
 
 build-c:
        ${JAVAH} -classpath build -jni -d build org.glite.lb.ContextIL
@@ -37,22 +45,28 @@ build-c:
        -ln -s ../../src_c/Makefile build/c
        cd build/c && make PREFIX=${PREFIX} JAVA_HOME=${jdk_prefix} topdir=../..
 
-examples: ${EXAMPLES}
+examples: build/examples
 
-GEN:=${stagedir}/sbin/glite-lb-at3 project/genEventTypes.pl
-AT3DIR:=${stagedir}/share/lb/at3
-axis_classpath:=`ls ${axis_prefix}/lib/*.jar | tr '\012' :`
+build/examples: ${FULL_EXAMPLES} ${SSL_EXAMPLES} ${TM_EXAMPLES}
+       -mkdir -p build/examples/src/simple-ssl build/examples/src/simple-trustmanager
+       ${jdk_prefix}/bin/javac -d build/examples -cp build:build/examples:${stagedir}/share/java/jobid-api-java.jar:${axis_classpath} ${FULL_EXAMPLES}
+       ${jdk_prefix}/bin/javac -d build/examples -cp build:build/examples:${axis_classpath} ${SSL_EXAMPLES}
+       ${jdk_prefix}/bin/javac -d build/examples -cp build:${trustmanager_classpath}:${axis_classpath} ${TM_EXAMPLES}
+       cp ${FULL_EXAMPLES} build/examples/src
+       cp ${SSL_EXAMPLES} build/examples/src/simple-ssl
+       cp ${TM_EXAMPLES} build/examples/src/simple-trustmanager
+       cd build/examples && ${jdk_prefix}/bin/jar cf lb-client-java-examples.jar src org $(addsuffix .class,$(basename $(notdir ${FULL_EXAMPLES})))
+
+genevents: build/gen
 
-genevents:
+build/gen:
        -mkdir -p build/gen
        ${GEN} build/gen
 
-genws: 
-       ${JAVA} -classpath ${axis_classpath} org.apache.axis.wsdl.WSDL2Java -o build/axis ${stagedir}/interface/LB.wsdl
-
-${EXAMPLES}: %.class: %.java
-       ${jdk_prefix}/bin/javac -d build -cp build:build/classes/:${stagedir}/share/java/jobid-api-java.jar:`ls ${axis_prefix}/lib/*.jar | tr '\012' :` $<
+genws: build/axis
 
+build/axis:
+       ${JAVA} -classpath ${axis_classpath} org.apache.axis.wsdl.WSDL2Java -o build/axis ${stagedir}/interface/LB.wsdl
 
 check:
        @echo "No check"
@@ -60,10 +74,11 @@ check:
 install:
        mkdir -p ${PREFIX}/share/java
        cp build/lb-client-java.jar ${PREFIX}/share/java
+       cp build/examples/lb-client-java-examples.jar ${PREFIX}/share/java
        cd build/c && make install PREFIX=${PREFIX}
 
 clean:
        rm -rf build
        cd src_c && make clean
 
-
+.PHONY: all compile compile-java build-jar build-c examples genevents genws check install clean

diff --git a/org.glite.lb.client/examples/webservices/java/src/ExampleSSLSocketFactory.java b/org.glite.lb.client-java/examples/simple-ssl/ExampleSSLSocketFactory.java
similarity index 99%
rename from org.glite.lb.client/examples/webservices/java/src/ExampleSSLSocketFactory.java
rename to org.glite.lb.client-java/examples/simple-ssl/ExampleSSLSocketFactory.java
index 711ab29..f29e3c0 100644 (file)
--- a/org.glite.lb.client/examples/webservices/java/src/ExampleSSLSocketFactory.java
+++ b/org.glite.lb.client-java/examples/simple-ssl/ExampleSSLSocketFactory.java
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package org.glite.wsdl.services.lb.example;
+package org.glite.lb.examples.ssl;
 
 import org.apache.axis.components.net.BooleanHolder;
 import org.apache.axis.components.net.DefaultSocketFactory;

diff --git a/org.glite.lb.client/examples/webservices/java/src/LBClientExample.java b/org.glite.lb.client-java/examples/simple-ssl/LBClientSSL.java
similarity index 88%
rename from org.glite.lb.client/examples/webservices/java/src/LBClientExample.java
rename to org.glite.lb.client-java/examples/simple-ssl/LBClientSSL.java
index d442056..afe8669 100644 (file)
--- a/org.glite.lb.client/examples/webservices/java/src/LBClientExample.java
+++ b/org.glite.lb.client-java/examples/simple-ssl/LBClientSSL.java
@@ -15,11 +15,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package org.glite.wsdl.services.lb.example;
+package org.glite.lb.examples.ssl;
 
 import org.apache.log4j.Logger;
-import org.glite.wsdl.services.lb.stubs.LoggingAndBookkeepingPortType;
-import org.glite.wsdl.services.lb.stubs.LoggingAndBookkeeping_ServiceLocator;
+import org.glite.wsdl.services.lb.LoggingAndBookkeepingPortType;
+import org.glite.wsdl.services.lb.LoggingAndBookkeepingLocator;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -41,12 +41,12 @@ import java.util.Enumeration;
  * @author Martin Kuba makub@ics.muni.cz
  * @version $Id$
  */
-public class LBClientExample {
-    static Logger log = Logger.getLogger(LBClientExample.class);
+public class LBClientSSL {
+    static Logger log = Logger.getLogger(LBClientSSL.class);
 
     public static void main(String[] args) throws Exception {
         if(args.length<2) {
-            System.out.println("usage: java LBClientExample <keystore.p12> <password> [<url>]");
+            System.out.println("usage: java LBClientSSL <keystore.p12> <password> [<url>]");
             System.exit(-1);
         }
         File keyfile = new File(args[0]);
@@ -76,7 +76,7 @@ public class LBClientExample {
         ExampleSSLSocketFactory.registerForAxis(certs, key, trustedCertAuths);
 
         //get client stub
-        LoggingAndBookkeepingPortType lb = new LoggingAndBookkeeping_ServiceLocator().getLoggingAndBookkeeping(url);
+        LoggingAndBookkeepingPortType lb = new LoggingAndBookkeepingLocator().getLoggingAndBookkeeping(url);
 
         //call the service
         String version = lb.getVersion(null);

diff --git a/org.glite.lb.client/examples/webservices/java/src/MyX509KeyManager.java b/org.glite.lb.client-java/examples/simple-ssl/MyX509KeyManager.java
similarity index 98%
rename from org.glite.lb.client/examples/webservices/java/src/MyX509KeyManager.java
rename to org.glite.lb.client-java/examples/simple-ssl/MyX509KeyManager.java
index 6731c9a..206098a 100644 (file)
--- a/org.glite.lb.client/examples/webservices/java/src/MyX509KeyManager.java
+++ b/org.glite.lb.client-java/examples/simple-ssl/MyX509KeyManager.java
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package org.glite.wsdl.services.lb.example;
+package org.glite.lb.examples.ssl;
 
 import org.apache.log4j.Logger;
 

diff --git a/org.glite.lb.client/examples/webservices/java/src/MyX509TrustManager.java b/org.glite.lb.client-java/examples/simple-ssl/MyX509TrustManager.java
similarity index 98%
rename from org.glite.lb.client/examples/webservices/java/src/MyX509TrustManager.java
rename to org.glite.lb.client-java/examples/simple-ssl/MyX509TrustManager.java
index 3c218ce..cec0ba7 100644 (file)
--- a/org.glite.lb.client/examples/webservices/java/src/MyX509TrustManager.java
+++ b/org.glite.lb.client-java/examples/simple-ssl/MyX509TrustManager.java
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package org.glite.wsdl.services.lb.example;
+package org.glite.lb.examples.ssl;
 
 import org.apache.log4j.Logger;
 

diff --git a/org.glite.lb.client/examples/webservices/java-trustmanager/src/LBClientTM.java b/org.glite.lb.client-java/examples/simple-trustmanager/LBClientTM.java
similarity index 78%
rename from org.glite.lb.client/examples/webservices/java-trustmanager/src/LBClientTM.java
rename to org.glite.lb.client-java/examples/simple-trustmanager/LBClientTM.java
index 3c46c19..eeff9f5 100644 (file)
--- a/org.glite.lb.client/examples/webservices/java-trustmanager/src/LBClientTM.java
+++ b/org.glite.lb.client-java/examples/simple-trustmanager/LBClientTM.java
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package org.glite.wsdl.services.lb.example;
+package org.glite.lb.examples.trustmanager;
 
 import java.net.URL;
 import org.apache.axis.AxisFault;
@@ -23,12 +23,14 @@ import org.apache.axis.AxisProperties;
 import org.apache.log4j.Logger;
 import org.apache.log4j.ConsoleAppender;
 
-import org.glite.security.trustmanager.ContextWrapper;
-
-import org.glite.wsdl.services.lb.stubs.LoggingAndBookkeeping_ServiceLocator;
-import org.glite.wsdl.services.lb.stubs.LoggingAndBookkeepingPortType;
-import org.glite.wsdl.services.lb.stubs.JobStatus;
+import org.glite.wsdl.services.lb.LoggingAndBookkeepingLocator;
+import org.glite.wsdl.services.lb.LoggingAndBookkeepingPortType;
+import org.glite.wsdl.types.lb.JobStatus;
 
+/**
+ * Example client of LoggingAndBookkeeping web service. It uses cryptography
+ * included in the gLite security trustmanager.
+ */
 public class LBClientTM {
        private static String proxyFile = null;
        private static String endpoint = "https://localhost:9003";
@@ -38,10 +40,6 @@ public class LBClientTM {
                if (args.length > 0) proxyFile = args[0];
                if (args.length > 1) endpoint = args[1];
 
-               ConsoleAppender ca = new ConsoleAppender(new org.apache.log4j.SimpleLayout());
-//             ca.activateOptions();
-               log.addAppender(ca);
-               
                log.info("endpoint being used "+ endpoint);
                if (proxyFile != null) log.info("proxy location being used " + proxyFile);
                
@@ -54,15 +52,15 @@ public class LBClientTM {
                System.setProperty("sslProtocol", "SSLv3");
                AxisProperties.setProperty("axis.socketSecureFactory","org.glite.security.trustmanager.axis.AXISSocketFactory");
                // certificate based authentication */
-//             System.setProperty("sslCertFile","/home/valtri/.cert/hostcert.pem");
-//             System.setProperty("sslKey","/home/valtri/.cert/hostkey.pem");
+//             System.setProperty("sslCertFile","/home/glite/.cert/hostcert.pem");
+//             System.setProperty("sslKey","/home/glite/.cert/hostkey.pem");
 //             System.setProperty("sslKeyPasswd","");
                
                // proxy based authentication
                if (proxyFile != null) System.setProperty("gridProxyFile", proxyFile);
                
                try {
-                       LoggingAndBookkeeping_ServiceLocator loc = new LoggingAndBookkeeping_ServiceLocator();
+                       LoggingAndBookkeepingLocator loc = new LoggingAndBookkeepingLocator();
                        String sn = loc.getLoggingAndBookkeepingWSDDServiceName();
                        log.info(" service name " + sn);
                        

diff --git a/org.glite.lb.client/examples/webservices/java-trustmanager/Makefile b/org.glite.lb.client/examples/webservices/java-trustmanager/Makefile
deleted file mode 100644 (file)
index c7204ba..0000000
--- a/org.glite.lb.client/examples/webservices/java-trustmanager/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-CLASSPATH:=${shell echo `find lib -type f | tr '\n' ':'`build}
-CLASSES=LBClientTM.class
-VPATH=src:build
-
-all: wsdl build
-
-wsdl: org/glite/wsdl/services/lb/stubs
-
-build: $(CLASSES)
-
-run:
-       if test -z "${FILE}" ; then echo 'Specify the FILE variable.'; exit 1; fi
-       java -classpath $(CLASSPATH) org.glite.wsdl.services.lb.example.LBClientTM ${FILE} ${ENDPOINT}
-
-clean:
-       rm -rvf build/
-
-org/glite/wsdl/services/lb/stubs:
-       java -classpath $(CLASSPATH) org.apache.axis.wsdl.WSDL2Java -v \
-         --buildFile \
-         --package org.glite.wsdl.services.lb.stubs \
-         --output build \
-         http://egee.cesnet.cz/cms/export/sites/egee/en/WSDL/HEAD/LB.wsdl
-
-LBClientTM.class: build/org/glite/wsdl/services/lb/stubs LBClientTM.java
-       -mkdir build
-       javac -classpath $(CLASSPATH) -d build src/*.java build/org/glite/wsdl/services/lb/{stubs,stubs/holders}/*.java
-
-.PHONY: all wsdl run clean

diff --git a/org.glite.lb.client/examples/webservices/java-trustmanager/README b/org.glite.lb.client/examples/webservices/java-trustmanager/README
deleted file mode 100644 (file)
index 0a5cdd8..0000000
--- a/org.glite.lb.client/examples/webservices/java-trustmanager/README
+++ /dev/null
@@ -1,39 +0,0 @@
-How to build
-============
-
-1) copy following files to lib/ directory:
-
-# AXIS
-axis-ant.jar
-axis.jar
-commons-discovery-0.2.jar
-commons-logging-1.0.4.jar
-jaxrpc.jar
-log4j.properties
-log4j-1.2.13.jar
-saaj.jar
-wsdl4j-1.5.1.jar
-
-# trustmanager
-glite-security-trustmanager.jar
-glite-security-util-java.jar
-
-# bouncycastle
-bcmail-jdk14-122.jar
-bcpg-jdk14-122.jar
-bcprov-jdk14-122.jar
-bctest-jdk14-122.jar
-
-2) generate source stubs and build the example by:
-
-  make
-
-
-Launch
-======
-
-  make run FILE=/tmp/x509up_u`id -u` ENDPOINT=https://host:9003
-
-or:
-
-  java -cp `find lib -type f | tr '\n' ':'`:build org.glite.wsdl.services.lb.example.LBClientTM /tmp/x509up_u`id -u` https://host:9003

diff --git a/org.glite.lb.client/examples/webservices/java/Makefile b/org.glite.lb.client/examples/webservices/java/Makefile
deleted file mode 100644 (file)
index 4d3f24c..0000000
--- a/org.glite.lb.client/examples/webservices/java/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-CLASSPATH:=${shell echo `find lib -type f | tr '\n' ':'`build}
-VPATH=src:build
-
-all: wsdl build
-
-wsdl: org/glite/wsdl/services/lb/stubs
-
-build: org/glite/wsdl/services/lb/example
-
-run:
-       if test -z "${FILE}" -o -z "${PASS}"; then echo 'Specify FILE and PASS variables.'; exit 1; fi
-       java -classpath $(CLASSPATH) org.glite.wsdl.services.lb.example.LBClientExample ${FILE} ${PASS} ${ENDPOINT}
-
-clean:
-       rm -rvf build/
-
-org/glite/wsdl/services/lb/stubs:
-       java -classpath $(CLASSPATH) org.apache.axis.wsdl.WSDL2Java -v \
-         --buildFile \
-         --package org.glite.wsdl.services.lb.stubs \
-         --output build \
-         http://egee.cesnet.cz/cms/export/sites/egee/en/WSDL/HEAD/LB.wsdl
-
-org/glite/wsdl/services/lb/example: build/org/glite/wsdl/services/lb/stubs
-       -mkdir build
-       javac -classpath $(CLASSPATH) -d build src/*.java build/org/glite/wsdl/services/lb/{stubs,stubs/holders}/*.java
-
-.PHONY: all wsdl run clean

diff --git a/org.glite.lb.client/examples/webservices/java/README b/org.glite.lb.client/examples/webservices/java/README
deleted file mode 100644 (file)
index 0af4d6b..0000000
--- a/org.glite.lb.client/examples/webservices/java/README
+++ /dev/null
@@ -1,28 +0,0 @@
-How to build
-============
-
-1) copy following files to lib/ directory:
-
-axis-ant.jar
-axis.jar
-commons-discovery-0.2.jar
-commons-logging-1.0.4.jar
-jaxrpc.jar
-log4j.properties
-log4j-1.2.13.jar
-saaj.jar
-wsdl4j-1.5.1.jar
-
-2) generate source stubs and build the example by:
-
-  make
-
-
-Launch
-======
-
-  make run FILE=file.p12 PASS=passphrase ENDPOINT=https://host:9003
-
-or:
-
-  java -cp `find lib -type f | tr '\n' ':'`:build org.glite.wsdl.services.lb.example.LBClientExample <file.p12> <passphrase> https://host:9003

diff --git a/org.glite.lb.client/examples/webservices/java/src/log4j.properties b/org.glite.lb.client/examples/webservices/java/src/log4j.properties
deleted file mode 100644 (file)
index cfdcee3..0000000
--- a/org.glite.lb.client/examples/webservices/java/src/log4j.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-# Set root category priority to INFO and its only appender to CONSOLE.
-# names CONSOLE, R, F are arbitrary
-log4j.rootCategory=INFO, CONSOLE
-
-# Set the enterprise logger category to FATAL and its only appender to CONSOLE.
-log4j.logger.org.apache.axis.enterprise=FATAL, CONSOLE
-log4j.logger.org.apache.axis.utils.JavaUtils=FATAL
-log4j.logger.org.glite.wsdl.services.lb=DEBUG
-
-# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-#viz http://logging.apache.org/log4j/docs/api/org/apache/log4j/PatternLayout.html
-# %d - date
-# %t - thread
-# %p - priority
-# %c{1} - category (jmeno loggeru) s poctem zobrazovanych casti oddelenych teckou
-# %m - message
-# %n - line separator
-log4j.appender.CONSOLE.layout.ConversionPattern=%d [%t] %-5p %c{1} - %m%n
-
-log4j.appender.F=org.apache.log4j.FileAppender
-log4j.appender.F.File=txt.log
-log4j.appender.F.layout=org.apache.log4j.PatternLayout
-log4j.appender.F.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-
-log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.R.File=xml.log
-log4j.appender.R.layout=org.apache.log4j.xml.XMLLayout
-log4j.appender.R.DatePattern='.'yyyy-MM-dd