[gemlca-commit] r21 - / trunk
commit at globus.org
commit at globus.org
Mon Nov 17 09:46:37 CST 2008
Author: kecske
Date: 2008-11-17 09:46:36 -0600 (Mon, 17 Nov 2008)
New Revision: 21
Added:
branches/
trunk/
trunk/JavaSource/
trunk/LICENSE
trunk/build.xml
trunk/install/
trunk/manual.pdf
trunk/namespace2package.mappings
trunk/schema/
trunk/scripts/
trunk/security-config.xml
Removed:
JavaSource/
LICENSE
build.xml
install/
manual.pdf
namespace2package.mappings
schema/
scripts/
security-config.xml
Log:
Reorganization
Deleted: LICENSE
===================================================================
--- LICENSE 2008-10-01 11:27:04 UTC (rev 20)
+++ LICENSE 2008-11-17 15:46:36 UTC (rev 21)
@@ -1,15 +0,0 @@
-/*
-* Copyright 1999-2006 University of Chicago
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
Deleted: build.xml
===================================================================
--- build.xml 2008-10-01 11:27:04 UTC (rev 20)
+++ build.xml 2008-11-17 15:46:36 UTC (rev 21)
@@ -1,426 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="all" name="GEMLCA build" basedir=".">
- <description>
- GEMLCA services build script based on the early WSRF examples.
- This script populates the installer directory. Before releasing
- the dir have to be filled up with the actual READMEs and external
- jars in the ext folder.
- !!!WARNING!!!
- On cleanup this script erases the clients and lib folders in the
- installer directory!
- !!!WARNING!!!
- </description>
-
- <!--
- Give user a chance to override without editing this file
- (and without typing -D each time it compiles it)
- -->
-
- <property name="GEMLCA_INST_DIR" location="install"/>
- <property name="GEMLCA_INST_LIB_DIR" value="${GEMLCA_INST_DIR}${file.separator}lib"/>
- <property name="GEMLCA_INST_LIB_EXT" value="${GEMLCA_INST_DIR}${file.separator}ext"/>
- <property name="GEMLCA_INST_CLI_DIR" value="${GEMLCA_INST_DIR}${file.separator}clients"/>
- <property name="GEMLCA_XMLBEANS_SCHEMA_DIR" value="${GEMLCA_INST_DIR}${file.separator}base${file.separator}conf"/>
-
- <property environment="env"/>
-
- <property file="build.properties"/>
- <property file="${user.home}/build.properties"/>
-
- <property name="globus.location" location="${env.GLOBUS_LOCATION}"/>
- <property name="package.name" value="globus_wsrf_core_samples"/>
- <property name="gar.name" value="${gar.filename}.gar"/>
- <property name="jar.name" value="${gar.filename}.jar"/>
- <property name="build.dir" location="build"/>
- <property name="build.dest" location="build/classes"/>
- <property name="build.lib.dir" location="build/lib"/>
- <property name="stubs.dir" location="build/stubs"/>
- <property name="stubs.src" location="build/stubs/src"/>
- <property name="stubs.dest" location="build/stubs/classes"/>
- <property name="stubs.jar.name" value="${gar.filename}_stubs.jar"/>
- <property name="build.packages" location=
- "${globus.location}/share/globus_wsrf_common/build-packages.xml"/>
- <property name="build.stubs" location=
- "${globus.location}/share/globus_wsrf_tools/build-stubs.xml"/>
- <property name="java.debug" value="on"/>
-
- <property name="schema.src" location="${globus.location}/share/schema"/>
- <property name="schema.local" location="schema"/>
- <property name="schema.dest" location="${build.dir}/schema"/>
-
- <property name="garjars.id" value="garjars"/>
- <fileset dir="${build.lib.dir}" id="garjars"/>
-
- <property name="garschema.id" value="garschema"/>
- <fileset dir="${schema.dest}" id="garschema">
- <include name="${schema.path}/**/*"/>
- </fileset>
-
- <property name="garetc.id" value="garetc"/>
- <fileset dir="etc" id="garetc"/>
-
- <property name="xmlbeans.src" location="build/xmlbeans/src"/>
- <property name="xmlbeans.classes" location="build/xmlbeans/classes"/>
-
- <target name="init">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dest}"/>
- <mkdir dir="${build.lib.dir}"/>
-
- <mkdir dir="${stubs.dir}"/>
- <mkdir dir="${stubs.src}"/>
- <mkdir dir="${stubs.dest}"/>
-
- <mkdir dir="${schema.dest}"/>
- <copy toDir="${schema.dest}">
- <fileset dir="${schema.src}" casesensitive="yes">
- <include name="wsrf/**/*"/>
- <include name="ws/**/*"/>
- <include name="mds/**/*"/>
- </fileset>
- <fileset dir="${schema.local}" casesensitive="yes">
- <include name="${schema.path}/*"/>
- </fileset>
- </copy>
-
- <available property="stubs.present" type="dir"
- file="${stubs.dest}/**/${service.name}" />
-
- <available property="factory.stubs.present" type="dir"
- file="${stubs.dest}/**/${factor.service.name}" />
-
- <mkdir dir="${GEMLCA_INST_CLI_DIR}"/>
- <mkdir dir="${GEMLCA_INST_LIB_DIR}"/>
- </target>
-
- <target name="flatten" depends="init">
- <ant antfile="${build.stubs}" target="flatten">
- <property name="source.flatten.dir"
- location="${schema.dest}/${schema.path}"/>
- <property name="target.flatten.dir"
- location="${schema.dest}/${schema.path}"/>
- <property name="wsdl.source"
- value="${interface.name}.wsdl"/>
- <property name="wsdl.target"
- value="${interface.name}_flattened.wsdl"/>
- <property name="wsdl.porttype" value="${interface.name}PortType"/>
- </ant>
- </target>
-
- <target name="factoryFlatten" depends="init">
- <ant antfile="${build.stubs}" target="flatten">
- <property name="source.flatten.dir"
- location="${schema.dest}/${factory.schema.path}"/>
- <property name="target.flatten.dir"
- location="${schema.dest}/${factory.schema.path}"/>
- <property name="wsdl.source"
- value="${factory.interface.name}.wsdl"/>
- <property name="wsdl.target"
- value="${factory.interface.name}_flattened.wsdl"/>
- <property name="wsdl.porttype" value="${factory.interface.name}PortType"/>
- </ant>
- </target>
-
- <target name="generateBindings" depends="flatten">
- <ant antfile="${build.stubs}" target="generateBinding">
- <property name="source.binding.dir"
- value="${schema.dest}/${schema.path}"/>
- <property name="target.binding.dir"
- value="${schema.dest}/${schema.path}"/>
- <property name="porttype.wsdl"
- value="${interface.name}_flattened.wsdl"/>
- <property name="binding.root"
- value="${interface.name}"/>
- </ant>
- </target>
-
- <target name="generateFactoryBindings" depends="factoryFlatten">
- <ant antfile="${build.stubs}" target="generateBinding">
- <property name="source.binding.dir"
- value="${schema.dest}/${factory.schema.path}"/>
- <property name="target.binding.dir"
- value="${schema.dest}/${factory.schema.path}"/>
- <property name="porttype.wsdl"
- value="${factory.interface.name}_flattened.wsdl"/>
- <property name="binding.root"
- value="${factory.interface.name}"/>
- </ant>
- </target>
-
-
- <target name="stubs" unless="stubs.present" depends="generateBindings">
- <ant antfile="${build.stubs}" target="mergePackageMapping">
- <property name="mapping.src" location="namespace2package.mappings"/>
- <property name="mapping.dst" location="${build.dir}/namespace2package.mappings"/>
- </ant>
- <ant antfile="${build.stubs}" target="generateStubs">
- <property name="mapping.file" location="${build.dir}/namespace2package.mappings"/>
- <property name="source.stubs.dir"
- location="${schema.dest}/${schema.path}"/>
- <property name="target.stubs.dir" location="${stubs.src}"/>
- <property name="wsdl.file"
- value="${interface.name}_service.wsdl"/>
- </ant>
- </target>
-
- <target name="factoryStubs" depends="generateFactoryBindings">
- <ant antfile="${build.stubs}" target="mergePackageMapping">
- <property name="mapping.src" location="namespace2package.mappings"/>
- <property name="mapping.dst" location="${build.dir}/namespace2package.mappings"/>
- </ant>
- <ant antfile="${build.stubs}" target="generateStubs">
- <property name="mapping.file" location="${build.dir}/namespace2package.mappings"/>
- <property name="source.stubs.dir"
- location="${schema.dest}/${factory.schema.path}"/>
- <property name="target.stubs.dir" location="${stubs.src}"/>
- <property name="wsdl.file"
- value="${factory.interface.name}_service.wsdl"/>
- </ant>
- </target>
-
- <target name="compileStubs" depends="stubs, factoryStubs">
- <javac srcdir="${stubs.src}" destdir="${stubs.dest}"
- debug="${java.debug}">
- <include name="**/*.java"/>
- <classpath>
- <fileset dir="${globus.location}/lib">
- <include name="*.jar"/>
- <exclude name="${stubs.jar.name}"/>
- <exclude name="${jar.name}"/>
- </fileset>
- </classpath>
- </javac>
- </target>
-
- <target name="compile" depends="compileStubs">
- <echo message="${package.dir}/impl/**"/>
- <javac srcdir="./JavaSource"
- includes="${package.dir}/impl/**"
- destdir="${build.dest}"
- debug="${java.debug}"
- deprecation="${deprecation}">
- <classpath>
- <pathelement location="${stubs.dest}"/>
- <fileset dir="${globus.location}/lib">
- <include name="*.jar"/>
- <exclude name="${stubs.jar.name}"/>
- <exclude name="${jar.name}"/>
- </fileset>
- <fileset dir="${GEMLCA_INST_LIB_DIR}">
- <filename name="*.jar"/>
- </fileset>
- <fileset dir="${GEMLCA_INST_LIB_EXT}">
- <filename name="*.jar"/>
- </fileset>
- <fileset dir="${GEMLCA_INST_CLI_DIR}">
- <filename name="*.jar"/>
- </fileset>
- </classpath>
- </javac>
- </target>
-
- <target name="jar" depends="compile">
-
- <copy file="security-config.xml"
- todir="build/classes/uk/ac/wmin/cpc/gemlca/frontend/GemlcaService/impl"/>
-
- <jar destfile="${build.lib.dir}/${jar.name}" basedir="${build.dest}" />
- <delete dir="${build.dest}"/>
- <mkdir dir="${build.dest}"/>
- </target>
-
-
- <target name="jarStubs" depends="compileStubs">
- <jar destfile="${build.lib.dir}/${stubs.jar.name}"
- basedir="${stubs.dest}"/>
- <copy file="${build.lib.dir}${file.separator}${stubs.jar.name}" todir="${GEMLCA_INST_CLI_DIR}"/>
- </target>
-
- <target name="microclean">
- <delete dir="${build.lib.dir}"/>
- <mkdir dir="${build.lib.dir}"/>
- <delete dir="${stubs.dir}"/>
- <mkdir dir="${stubs.dir}"/>
- <delete dir="${schema.dest}"/>
- <mkdir dir="${schema.dest}"/>
- <delete>
- <fileset dir="${build.dir}">
- <filename name="**/frontend/**/*.class"/>
- </fileset>
- </delete>
- </target>
-
- <target name="dist" depends="microclean, jarStubs, jar">
- <ant antfile="${build.packages}" target="makeGar">
- <property name="garserverdeployment.file" value="JavaSource/${package.dir}/deploy-server.wsdd"/>
- <property name="garclientdeployment.file" value="JavaSource/${package.dir}/deploy-client.wsdd"/>
- <property name="garclientserverdeployment.file" value="JavaSource/${package.dir}/deploy-client-server.wsdd"/>
- <property name="garjndiconfigdeployment.file" value="JavaSource/${package.dir}/deploy-jndi-config.xml"/>
- <reference refid="${garjars.id}"/>
- <reference refid="${garschema.id}"/>
- <reference refid="${garetc.id}"/>
- </ant>
- <move todir="${GEMLCA_INST_LIB_DIR}">
- <fileset dir="${basedir}">
- <filename name="*.gar"/>
- </fileset>
- </move>
- </target>
-
- <target name="clean">
- <delete dir="tmp"/>
- <delete dir="${build.dir}"/>
- <delete file="${gar.name}"/>
- <delete dir="${GEMLCA_INST_CLI_DIR}"/>
- <delete dir="${GEMLCA_INST_LIB_DIR}"/>
- </target>
-
- <target name="deploy">
- <ant antfile="${build.packages}" target="deployGar">
- </ant>
- </target>
-
- <target name="undeploy">
- <ant antfile="${build.packages}" target="undeploy">
- <property name="gar.id" value="${package.name}"/>
- </ant>
- </target>
-
- <target name="etcdir">
- <mkdir dir="etc"/>
- </target>
-
- <target name="GemlcaService" depends="etcdir">
- <antcall target="dist" inheritAll="false">
- <param name="package" value="uk.ac.wmin.cpc.gemlca.frontend.GemlcaService"/>
- <param name="interface.name" value="GemlcaService"/>
- <param name="factory.interface.name" value="GemlcaFactoryService"/>
- <param name="package.dir" value="uk/ac/wmin/cpc/gemlca/frontend/GemlcaService"/>
- <param name="schema.path" value="gemlca/frontend"/>
- <param name="factory.schema.path" value="gemlca/frontend"/>
- <param name="service.name" value="frontend"/>
- <param name="gar.filename" value="uk_ac_wmin_cpc_gemlca_frontend_GemlcaService"/>
- </antcall>
- </target>
-
- <target name="gemlcabuild" depends="init,compileSchemas">
- <javac destdir="${build.dest}" debug="${java.debug}">
- <src path="JavaSource/uk/ac/wmin/cpc/gemlca/core"/>
- <src path="JavaSource/uk/ac/wmin/cpc/gemlca/exception"/>
- <src path="JavaSource/uk/ac/wmin/cpc/gemlca/backend"/>
- <src path="JavaSource/uk/ac/wmin/cpc/gemlca/frontend/helpers"/>
- <classpath>
- <fileset dir="${env.GLOBUS_LOCATION}${file.separator}lib">
- <filename name="**/*.jar"/>
- </fileset>
- <fileset dir="${GEMLCA_INST_LIB_DIR}">
- <filename name="*.jar"/>
- </fileset>
- <fileset dir="${GEMLCA_INST_LIB_EXT}">
- <filename name="*.jar"/>
- </fileset>
- </classpath>
- </javac>
- <jar destfile="${GEMLCA_INST_LIB_DIR}${file.separator}uk_ac_wmin_cpc_gemlca_core.jar">
- <fileset dir="${build.dest}">
- <filename name="**/core/**/*.class"/>
- </fileset>
- <fileset dir="${build.dest}">
- <filename name="**/exception/**/*.class"/>
- </fileset>
- </jar>
- <jar destfile="${GEMLCA_INST_LIB_DIR}${file.separator}uk_ac_wmin_cpc_gemlca_backend.jar">
- <fileset dir="${build.dest}">
- <filename name="**/backend/**/*.class"/>
- </fileset>
- </jar>
- <jar destfile="${GEMLCA_INST_LIB_DIR}${file.separator}uk_ac_wmin_cpc_gemlca_frontend_helpers.jar">
- <fileset dir="${build.dest}">
- <filename name="**/frontend/helpers/**/*.class"/>
- </fileset>
- </jar>
- <delete dir="${build.dest}"/>
- <mkdir dir="${build.dest}"/>
- </target>
-
- <target name="allServices" depends="clean,gemlcabuild,GemlcaService"/>
-
- <target name="client" depends="clean,allServices">
- <javac srcdir="./JavaSource/uk/ac/wmin/cpc/gemlca" destdir="${build.dest}" debug="${java.debug}">
- <classpath>
- <fileset dir="${env.GLOBUS_LOCATION}${file.separator}lib">
- <filename name="**/*.jar"/>
- </fileset>
- <fileset dir="${GEMLCA_INST_CLI_DIR}">
- <filename name="*stub*.jar"/>
- </fileset>
- </classpath>
- <include name="exception/*.java"/>
- <include name="core/helpers/LCLog.java"/>
- <include name="core/helpers/CacheMap.java"/>
- <include name="core/helpers/AccountingLevel.java"/>
- <include name="frontend/GemlcaService/impl/GemlcaServiceNamespaces.java"/>
- <include name="frontend/helpers/FrontendMessages.java"/>
- <include name="client/**/*.java"/>
- </javac>
- <jar destfile="${GEMLCA_INST_CLI_DIR}${file.separator}uk_ac_wmin_cpc_gemlca_client.jar" basedir="${build.dest}"/>
- </target>
-
- <target name="compileSchemas" >
- <mkdir dir="${xmlbeans.src}"/>
- <mkdir dir="${xmlbeans.classes}"/>
-
- <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler"
- dir="${schema.local}"
- fork="true">
-
- <classpath>
- <fileset dir="${GEMLCA_INST_DIR}${file.separator}ext">
- <filename name="*.jar"/>
- </fileset>
- </classpath>
-
- <arg value="-srconly" />
- <arg value="-src" />
- <arg value="${xmlbeans.src}"/>
- <arg value="-d" />
- <arg value="${xmlbeans.classes}"/>
- <arg value="${GEMLCA_XMLBEANS_SCHEMA_DIR}${file.separator}generalParameters.xsd" />
- <arg value="${GEMLCA_XMLBEANS_SCHEMA_DIR}${file.separator}config.xsdconfig" />
- </java>
-
- <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler"
- dir="${schema.local}"
- fork="true">
-
- <classpath>
- <fileset dir="${GEMLCA_INST_DIR}${file.separator}ext">
- <filename name="*.jar"/>
- </fileset>
- </classpath>
-
- <arg value="-srconly" />
- <arg value="-src" />
- <arg value="${xmlbeans.src}"/>
- <arg value="-d" />
- <arg value="${xmlbeans.classes}"/>
- <arg value="${GEMLCA_XMLBEANS_SCHEMA_DIR}${file.separator}legacyCodeConfig.xsd" />
- <arg value="${GEMLCA_XMLBEANS_SCHEMA_DIR}${file.separator}config.xsdconfig" />
- </java>
-
- <javac srcdir="${xmlbeans.src}" destdir="${xmlbeans.classes}" debug="${java.debug}">
- <classpath>
- <fileset dir="${GEMLCA_INST_DIR}${file.separator}ext">
- <filename name="*.jar"/>
- </fileset>
- </classpath>
- <include name="**/*.java"/>
- </javac>
- <jar destfile="${GEMLCA_INST_LIB_DIR}${file.separator}uk_ac_wmin_cpc_gemlca_core_schema.jar" basedir="${xmlbeans.classes}"/>
-
- </target>
-
-
- <target name="all" depends="allServices,client"/>
-</project>
Deleted: manual.pdf
===================================================================
(Binary files differ)
Deleted: namespace2package.mappings
===================================================================
--- namespace2package.mappings 2008-10-01 11:27:04 UTC (rev 20)
+++ namespace2package.mappings 2008-11-17 15:46:36 UTC (rev 21)
@@ -1,11 +0,0 @@
-http\://www.cpc.wmin.ac.uk/gemlca/wsrf/GemlcaService=uk.ac.wmin.cpc.gemlca.frontend.stubs.GemlcaService
-http\://www.cpc.wmin.ac.uk/gemlca/wsrf/GemlcaService/bindings=uk.ac.wmin.cpc.gemlca.frontend.stubs.GemlcaService.bindings
-http\://www.cpc.wmin.ac.uk/gemlca/wsrf/GemlcaService/service=uk.ac.wmin.cpc.gemlca.frontend.stubs.GemlcaService.service
-
-http\://www.cpc.wmin.ac.uk/gemlca/wsrf/GemlcaFactoryService=uk.ac.wmin.cpc.gemlca.frontend.stubs.GemlcaFactoryService
-http\://www.cpc.wmin.ac.uk/gemlca/wsrf/GemlcaFactoryService/bindings=uk.ac.wmin.cpc.gemlca.frontend.stubs.GemlcaFactoryService.bindings
-http\://www.cpc.wmin.ac.uk/gemlca/wsrf/GemlcaFactoryService/service=uk.ac.wmin.cpc.gemlca.frontend.stubs.GemlcaFactoryService.service
-
-
-http\://www.cpc.wmin.ac.uk/gemlca/wsrf/common=uk.ac.wmin.cpc.gemlca.frontend.stubs.common
-
Deleted: security-config.xml
===================================================================
--- security-config.xml 2008-10-01 11:27:04 UTC (rev 20)
+++ security-config.xml 2008-11-17 15:46:36 UTC (rev 21)
@@ -1,26 +0,0 @@
-<securityConfig xmlns="http://www.globus.org">
-
- <auth-method>
- <GSITransport/>
- </auth-method>
-
- <run-as>
- <caller-identity/>
- </run-as>
-
- <authz value="gridmap"/>
- <gridmap value="/etc/grid-security/grid-mapfile"/>
-
- <method name="getResourceProperty">
- <auth-method>
- <none/>
- </auth-method>
- </method>
-
- <method name="getMultipleResourceProperties">
- <auth-method>
- <none/>
- </auth-method>
- </method>
-
-</securityConfig>
Copied: trunk/JavaSource (from rev 20, JavaSource)
Copied: trunk/LICENSE (from rev 20, LICENSE)
===================================================================
--- trunk/LICENSE (rev 0)
+++ trunk/LICENSE 2008-11-17 15:46:36 UTC (rev 21)
@@ -0,0 +1,15 @@
+/*
+* Copyright 1999-2006 University of Chicago
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
Copied: trunk/build.xml (from rev 20, build.xml)
===================================================================
--- trunk/build.xml (rev 0)
+++ trunk/build.xml 2008-11-17 15:46:36 UTC (rev 21)
@@ -0,0 +1,426 @@
+<?xml version="1.0"?>
+
+<project default="all" name="GEMLCA build" basedir=".">
+ <description>
+ GEMLCA services build script based on the early WSRF examples.
+ This script populates the installer directory. Before releasing
+ the dir have to be filled up with the actual READMEs and external
+ jars in the ext folder.
+ !!!WARNING!!!
+ On cleanup this script erases the clients and lib folders in the
+ installer directory!
+ !!!WARNING!!!
+ </description>
+
+ <!--
+ Give user a chance to override without editing this file
+ (and without typing -D each time it compiles it)
+ -->
+
+ <property name="GEMLCA_INST_DIR" location="install"/>
+ <property name="GEMLCA_INST_LIB_DIR" value="${GEMLCA_INST_DIR}${file.separator}lib"/>
+ <property name="GEMLCA_INST_LIB_EXT" value="${GEMLCA_INST_DIR}${file.separator}ext"/>
+ <property name="GEMLCA_INST_CLI_DIR" value="${GEMLCA_INST_DIR}${file.separator}clients"/>
+ <property name="GEMLCA_XMLBEANS_SCHEMA_DIR" value="${GEMLCA_INST_DIR}${file.separator}base${file.separator}conf"/>
+
+ <property environment="env"/>
+
+ <property file="build.properties"/>
+ <property file="${user.home}/build.properties"/>
+
+ <property name="globus.location" location="${env.GLOBUS_LOCATION}"/>
+ <property name="package.name" value="globus_wsrf_core_samples"/>
+ <property name="gar.name" value="${gar.filename}.gar"/>
+ <property name="jar.name" value="${gar.filename}.jar"/>
+ <property name="build.dir" location="build"/>
+ <property name="build.dest" location="build/classes"/>
+ <property name="build.lib.dir" location="build/lib"/>
+ <property name="stubs.dir" location="build/stubs"/>
+ <property name="stubs.src" location="build/stubs/src"/>
+ <property name="stubs.dest" location="build/stubs/classes"/>
+ <property name="stubs.jar.name" value="${gar.filename}_stubs.jar"/>
+ <property name="build.packages" location=
+ "${globus.location}/share/globus_wsrf_common/build-packages.xml"/>
+ <property name="build.stubs" location=
+ "${globus.location}/share/globus_wsrf_tools/build-stubs.xml"/>
+ <property name="java.debug" value="on"/>
+
+ <property name="schema.src" location="${globus.location}/share/schema"/>
+ <property name="schema.local" location="schema"/>
+ <property name="schema.dest" location="${build.dir}/schema"/>
+
+ <property name="garjars.id" value="garjars"/>
+ <fileset dir="${build.lib.dir}" id="garjars"/>
+
+ <property name="garschema.id" value="garschema"/>
+ <fileset dir="${schema.dest}" id="garschema">
+ <include name="${schema.path}/**/*"/>
+ </fileset>
+
+ <property name="garetc.id" value="garetc"/>
+ <fileset dir="etc" id="garetc"/>
+
+ <property name="xmlbeans.src" location="build/xmlbeans/src"/>
+ <property name="xmlbeans.classes" location="build/xmlbeans/classes"/>
+
+ <target name="init">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.dest}"/>
+ <mkdir dir="${build.lib.dir}"/>
+
+ <mkdir dir="${stubs.dir}"/>
+ <mkdir dir="${stubs.src}"/>
+ <mkdir dir="${stubs.dest}"/>
+
+ <mkdir dir="${schema.dest}"/>
+ <copy toDir="${schema.dest}">
+ <fileset dir="${schema.src}" casesensitive="yes">
+ <include name="wsrf/**/*"/>
+ <include name="ws/**/*"/>
+ <include name="mds/**/*"/>
+ </fileset>
+ <fileset dir="${schema.local}" casesensitive="yes">
+ <include name="${schema.path}/*"/>
+ </fileset>
+ </copy>
+
+ <available property="stubs.present" type="dir"
+ file="${stubs.dest}/**/${service.name}" />
+
+ <available property="factory.stubs.present" type="dir"
+ file="${stubs.dest}/**/${factor.service.name}" />
+
+ <mkdir dir="${GEMLCA_INST_CLI_DIR}"/>
+ <mkdir dir="${GEMLCA_INST_LIB_DIR}"/>
+ </target>
+
+ <target name="flatten" depends="init">
+ <ant antfile="${build.stubs}" target="flatten">
+ <property name="source.flatten.dir"
+ location="${schema.dest}/${schema.path}"/>
+ <property name="target.flatten.dir"
+ location="${schema.dest}/${schema.path}"/>
+ <property name="wsdl.source"
+ value="${interface.name}.wsdl"/>
+ <property name="wsdl.target"
+ value="${interface.name}_flattened.wsdl"/>
+ <property name="wsdl.porttype" value="${interface.name}PortType"/>
+ </ant>
+ </target>
+
+ <target name="factoryFlatten" depends="init">
+ <ant antfile="${build.stubs}" target="flatten">
+ <property name="source.flatten.dir"
+ location="${schema.dest}/${factory.schema.path}"/>
+ <property name="target.flatten.dir"
+ location="${schema.dest}/${factory.schema.path}"/>
+ <property name="wsdl.source"
+ value="${factory.interface.name}.wsdl"/>
+ <property name="wsdl.target"
+ value="${factory.interface.name}_flattened.wsdl"/>
+ <property name="wsdl.porttype" value="${factory.interface.name}PortType"/>
+ </ant>
+ </target>
+
+ <target name="generateBindings" depends="flatten">
+ <ant antfile="${build.stubs}" target="generateBinding">
+ <property name="source.binding.dir"
+ value="${schema.dest}/${schema.path}"/>
+ <property name="target.binding.dir"
+ value="${schema.dest}/${schema.path}"/>
+ <property name="porttype.wsdl"
+ value="${interface.name}_flattened.wsdl"/>
+ <property name="binding.root"
+ value="${interface.name}"/>
+ </ant>
+ </target>
+
+ <target name="generateFactoryBindings" depends="factoryFlatten">
+ <ant antfile="${build.stubs}" target="generateBinding">
+ <property name="source.binding.dir"
+ value="${schema.dest}/${factory.schema.path}"/>
+ <property name="target.binding.dir"
+ value="${schema.dest}/${factory.schema.path}"/>
+ <property name="porttype.wsdl"
+ value="${factory.interface.name}_flattened.wsdl"/>
+ <property name="binding.root"
+ value="${factory.interface.name}"/>
+ </ant>
+ </target>
+
+
+ <target name="stubs" unless="stubs.present" depends="generateBindings">
+ <ant antfile="${build.stubs}" target="mergePackageMapping">
+ <property name="mapping.src" location="namespace2package.mappings"/>
+ <property name="mapping.dst" location="${build.dir}/namespace2package.mappings"/>
+ </ant>
+ <ant antfile="${build.stubs}" target="generateStubs">
+ <property name="mapping.file" location="${build.dir}/namespace2package.mappings"/>
+ <property name="source.stubs.dir"
+ location="${schema.dest}/${schema.path}"/>
+ <property name="target.stubs.dir" location="${stubs.src}"/>
+ <property name="wsdl.file"
+ value="${interface.name}_service.wsdl"/>
+ </ant>
+ </target>
+
+ <target name="factoryStubs" depends="generateFactoryBindings">
+ <ant antfile="${build.stubs}" target="mergePackageMapping">
+ <property name="mapping.src" location="namespace2package.mappings"/>
+ <property name="mapping.dst" location="${build.dir}/namespace2package.mappings"/>
+ </ant>
+ <ant antfile="${build.stubs}" target="generateStubs">
+ <property name="mapping.file" location="${build.dir}/namespace2package.mappings"/>
+ <property name="source.stubs.dir"
+ location="${schema.dest}/${factory.schema.path}"/>
+ <property name="target.stubs.dir" location="${stubs.src}"/>
+ <property name="wsdl.file"
+ value="${factory.interface.name}_service.wsdl"/>
+ </ant>
+ </target>
+
+ <target name="compileStubs" depends="stubs, factoryStubs">
+ <javac srcdir="${stubs.src}" destdir="${stubs.dest}"
+ debug="${java.debug}">
+ <include name="**/*.java"/>
+ <classpath>
+ <fileset dir="${globus.location}/lib">
+ <include name="*.jar"/>
+ <exclude name="${stubs.jar.name}"/>
+ <exclude name="${jar.name}"/>
+ </fileset>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile" depends="compileStubs">
+ <echo message="${package.dir}/impl/**"/>
+ <javac srcdir="./JavaSource"
+ includes="${package.dir}/impl/**"
+ destdir="${build.dest}"
+ debug="${java.debug}"
+ deprecation="${deprecation}">
+ <classpath>
+ <pathelement location="${stubs.dest}"/>
+ <fileset dir="${globus.location}/lib">
+ <include name="*.jar"/>
+ <exclude name="${stubs.jar.name}"/>
+ <exclude name="${jar.name}"/>
+ </fileset>
+ <fileset dir="${GEMLCA_INST_LIB_DIR}">
+ <filename name="*.jar"/>
+ </fileset>
+ <fileset dir="${GEMLCA_INST_LIB_EXT}">
+ <filename name="*.jar"/>
+ </fileset>
+ <fileset dir="${GEMLCA_INST_CLI_DIR}">
+ <filename name="*.jar"/>
+ </fileset>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="jar" depends="compile">
+
+ <copy file="security-config.xml"
+ todir="build/classes/uk/ac/wmin/cpc/gemlca/frontend/GemlcaService/impl"/>
+
+ <jar destfile="${build.lib.dir}/${jar.name}" basedir="${build.dest}" />
+ <delete dir="${build.dest}"/>
+ <mkdir dir="${build.dest}"/>
+ </target>
+
+
+ <target name="jarStubs" depends="compileStubs">
+ <jar destfile="${build.lib.dir}/${stubs.jar.name}"
+ basedir="${stubs.dest}"/>
+ <copy file="${build.lib.dir}${file.separator}${stubs.jar.name}" todir="${GEMLCA_INST_CLI_DIR}"/>
+ </target>
+
+ <target name="microclean">
+ <delete dir="${build.lib.dir}"/>
+ <mkdir dir="${build.lib.dir}"/>
+ <delete dir="${stubs.dir}"/>
+ <mkdir dir="${stubs.dir}"/>
+ <delete dir="${schema.dest}"/>
+ <mkdir dir="${schema.dest}"/>
+ <delete>
+ <fileset dir="${build.dir}">
+ <filename name="**/frontend/**/*.class"/>
+ </fileset>
+ </delete>
+ </target>
+
+ <target name="dist" depends="microclean, jarStubs, jar">
+ <ant antfile="${build.packages}" target="makeGar">
+ <property name="garserverdeployment.file" value="JavaSource/${package.dir}/deploy-server.wsdd"/>
+ <property name="garclientdeployment.file" value="JavaSource/${package.dir}/deploy-client.wsdd"/>
+ <property name="garclientserverdeployment.file" value="JavaSource/${package.dir}/deploy-client-server.wsdd"/>
+ <property name="garjndiconfigdeployment.file" value="JavaSource/${package.dir}/deploy-jndi-config.xml"/>
+ <reference refid="${garjars.id}"/>
+ <reference refid="${garschema.id}"/>
+ <reference refid="${garetc.id}"/>
+ </ant>
+ <move todir="${GEMLCA_INST_LIB_DIR}">
+ <fileset dir="${basedir}">
+ <filename name="*.gar"/>
+ </fileset>
+ </move>
+ </target>
+
+ <target name="clean">
+ <delete dir="tmp"/>
+ <delete dir="${build.dir}"/>
+ <delete file="${gar.name}"/>
+ <delete dir="${GEMLCA_INST_CLI_DIR}"/>
+ <delete dir="${GEMLCA_INST_LIB_DIR}"/>
+ </target>
+
+ <target name="deploy">
+ <ant antfile="${build.packages}" target="deployGar">
+ </ant>
+ </target>
+
+ <target name="undeploy">
+ <ant antfile="${build.packages}" target="undeploy">
+ <property name="gar.id" value="${package.name}"/>
+ </ant>
+ </target>
+
+ <target name="etcdir">
+ <mkdir dir="etc"/>
+ </target>
+
+ <target name="GemlcaService" depends="etcdir">
+ <antcall target="dist" inheritAll="false">
+ <param name="package" value="uk.ac.wmin.cpc.gemlca.frontend.GemlcaService"/>
+ <param name="interface.name" value="GemlcaService"/>
+ <param name="factory.interface.name" value="GemlcaFactoryService"/>
+ <param name="package.dir" value="uk/ac/wmin/cpc/gemlca/frontend/GemlcaService"/>
+ <param name="schema.path" value="gemlca/frontend"/>
+ <param name="factory.schema.path" value="gemlca/frontend"/>
+ <param name="service.name" value="frontend"/>
+ <param name="gar.filename" value="uk_ac_wmin_cpc_gemlca_frontend_GemlcaService"/>
+ </antcall>
+ </target>
+
+ <target name="gemlcabuild" depends="init,compileSchemas">
+ <javac destdir="${build.dest}" debug="${java.debug}">
+ <src path="JavaSource/uk/ac/wmin/cpc/gemlca/core"/>
+ <src path="JavaSource/uk/ac/wmin/cpc/gemlca/exception"/>
+ <src path="JavaSource/uk/ac/wmin/cpc/gemlca/backend"/>
+ <src path="JavaSource/uk/ac/wmin/cpc/gemlca/frontend/helpers"/>
+ <classpath>
+ <fileset dir="${env.GLOBUS_LOCATION}${file.separator}lib">
+ <filename name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${GEMLCA_INST_LIB_DIR}">
+ <filename name="*.jar"/>
+ </fileset>
+ <fileset dir="${GEMLCA_INST_LIB_EXT}">
+ <filename name="*.jar"/>
+ </fileset>
+ </classpath>
+ </javac>
+ <jar destfile="${GEMLCA_INST_LIB_DIR}${file.separator}uk_ac_wmin_cpc_gemlca_core.jar">
+ <fileset dir="${build.dest}">
+ <filename name="**/core/**/*.class"/>
+ </fileset>
+ <fileset dir="${build.dest}">
+ <filename name="**/exception/**/*.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${GEMLCA_INST_LIB_DIR}${file.separator}uk_ac_wmin_cpc_gemlca_backend.jar">
+ <fileset dir="${build.dest}">
+ <filename name="**/backend/**/*.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${GEMLCA_INST_LIB_DIR}${file.separator}uk_ac_wmin_cpc_gemlca_frontend_helpers.jar">
+ <fileset dir="${build.dest}">
+ <filename name="**/frontend/helpers/**/*.class"/>
+ </fileset>
+ </jar>
+ <delete dir="${build.dest}"/>
+ <mkdir dir="${build.dest}"/>
+ </target>
+
+ <target name="allServices" depends="clean,gemlcabuild,GemlcaService"/>
+
+ <target name="client" depends="clean,allServices">
+ <javac srcdir="./JavaSource/uk/ac/wmin/cpc/gemlca" destdir="${build.dest}" debug="${java.debug}">
+ <classpath>
+ <fileset dir="${env.GLOBUS_LOCATION}${file.separator}lib">
+ <filename name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${GEMLCA_INST_CLI_DIR}">
+ <filename name="*stub*.jar"/>
+ </fileset>
+ </classpath>
+ <include name="exception/*.java"/>
+ <include name="core/helpers/LCLog.java"/>
+ <include name="core/helpers/CacheMap.java"/>
+ <include name="core/helpers/AccountingLevel.java"/>
+ <include name="frontend/GemlcaService/impl/GemlcaServiceNamespaces.java"/>
+ <include name="frontend/helpers/FrontendMessages.java"/>
+ <include name="client/**/*.java"/>
+ </javac>
+ <jar destfile="${GEMLCA_INST_CLI_DIR}${file.separator}uk_ac_wmin_cpc_gemlca_client.jar" basedir="${build.dest}"/>
+ </target>
+
+ <target name="compileSchemas" >
+ <mkdir dir="${xmlbeans.src}"/>
+ <mkdir dir="${xmlbeans.classes}"/>
+
+ <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler"
+ dir="${schema.local}"
+ fork="true">
+
+ <classpath>
+ <fileset dir="${GEMLCA_INST_DIR}${file.separator}ext">
+ <filename name="*.jar"/>
+ </fileset>
+ </classpath>
+
+ <arg value="-srconly" />
+ <arg value="-src" />
+ <arg value="${xmlbeans.src}"/>
+ <arg value="-d" />
+ <arg value="${xmlbeans.classes}"/>
+ <arg value="${GEMLCA_XMLBEANS_SCHEMA_DIR}${file.separator}generalParameters.xsd" />
+ <arg value="${GEMLCA_XMLBEANS_SCHEMA_DIR}${file.separator}config.xsdconfig" />
+ </java>
+
+ <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler"
+ dir="${schema.local}"
+ fork="true">
+
+ <classpath>
+ <fileset dir="${GEMLCA_INST_DIR}${file.separator}ext">
+ <filename name="*.jar"/>
+ </fileset>
+ </classpath>
+
+ <arg value="-srconly" />
+ <arg value="-src" />
+ <arg value="${xmlbeans.src}"/>
+ <arg value="-d" />
+ <arg value="${xmlbeans.classes}"/>
+ <arg value="${GEMLCA_XMLBEANS_SCHEMA_DIR}${file.separator}legacyCodeConfig.xsd" />
+ <arg value="${GEMLCA_XMLBEANS_SCHEMA_DIR}${file.separator}config.xsdconfig" />
+ </java>
+
+ <javac srcdir="${xmlbeans.src}" destdir="${xmlbeans.classes}" debug="${java.debug}">
+ <classpath>
+ <fileset dir="${GEMLCA_INST_DIR}${file.separator}ext">
+ <filename name="*.jar"/>
+ </fileset>
+ </classpath>
+ <include name="**/*.java"/>
+ </javac>
+ <jar destfile="${GEMLCA_INST_LIB_DIR}${file.separator}uk_ac_wmin_cpc_gemlca_core_schema.jar" basedir="${xmlbeans.classes}"/>
+
+ </target>
+
+
+ <target name="all" depends="allServices,client"/>
+</project>
Copied: trunk/install (from rev 20, install)
Copied: trunk/manual.pdf (from rev 20, manual.pdf)
===================================================================
(Binary files differ)
Copied: trunk/namespace2package.mappings (from rev 20, namespace2package.mappings)
===================================================================
--- trunk/namespace2package.mappings (rev 0)
+++ trunk/namespace2package.mappings 2008-11-17 15:46:36 UTC (rev 21)
@@ -0,0 +1,11 @@
+http\://www.cpc.wmin.ac.uk/gemlca/wsrf/GemlcaService=uk.ac.wmin.cpc.gemlca.frontend.stubs.GemlcaService
+http\://www.cpc.wmin.ac.uk/gemlca/wsrf/GemlcaService/bindings=uk.ac.wmin.cpc.gemlca.frontend.stubs.GemlcaService.bindings
+http\://www.cpc.wmin.ac.uk/gemlca/wsrf/GemlcaService/service=uk.ac.wmin.cpc.gemlca.frontend.stubs.GemlcaService.service
+
+http\://www.cpc.wmin.ac.uk/gemlca/wsrf/GemlcaFactoryService=uk.ac.wmin.cpc.gemlca.frontend.stubs.GemlcaFactoryService
+http\://www.cpc.wmin.ac.uk/gemlca/wsrf/GemlcaFactoryService/bindings=uk.ac.wmin.cpc.gemlca.frontend.stubs.GemlcaFactoryService.bindings
+http\://www.cpc.wmin.ac.uk/gemlca/wsrf/GemlcaFactoryService/service=uk.ac.wmin.cpc.gemlca.frontend.stubs.GemlcaFactoryService.service
+
+
+http\://www.cpc.wmin.ac.uk/gemlca/wsrf/common=uk.ac.wmin.cpc.gemlca.frontend.stubs.common
+
Copied: trunk/schema (from rev 20, schema)
Copied: trunk/scripts (from rev 20, scripts)
Copied: trunk/security-config.xml (from rev 20, security-config.xml)
===================================================================
--- trunk/security-config.xml (rev 0)
+++ trunk/security-config.xml 2008-11-17 15:46:36 UTC (rev 21)
@@ -0,0 +1,26 @@
+<securityConfig xmlns="http://www.globus.org">
+
+ <auth-method>
+ <GSITransport/>
+ </auth-method>
+
+ <run-as>
+ <caller-identity/>
+ </run-as>
+
+ <authz value="gridmap"/>
+ <gridmap value="/etc/grid-security/grid-mapfile"/>
+
+ <method name="getResourceProperty">
+ <auth-method>
+ <none/>
+ </auth-method>
+ </method>
+
+ <method name="getMultipleResourceProperties">
+ <auth-method>
+ <none/>
+ </auth-method>
+ </method>
+
+</securityConfig>
More information about the gemlca-commit
mailing list