You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pr...@apache.org on 2007/08/09 17:15:50 UTC
svn commit: r564235 [8/9] - in /webservices/axis2/branches/java/jaxws21: ./
legal/ modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb/src/org/apache/axis2/databinding/utils/
modules/addressing/src/org/apache/axis2/handlers/addressing...
Modified: webservices/axis2/branches/java/jaxws21/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java Thu Aug 9 08:14:52 2007
@@ -57,12 +57,14 @@
log.debug("script services init");
AxisConfiguration axisConfig = configContext.getAxisConfiguration();
-
- File scriptServicesDirectory = getScriptServicesDirectory(axisConfig);
- ScriptDeploymentEngine deploymentEngine = new ScriptDeploymentEngine(axisConfig);
- deploymentEngine.loadRepository(scriptServicesDirectory);
- deploymentEngine.loadServices();
-
+ if(axisConfig.getRepository() == null) {
+ log.error("AxisConfiguration getRepository returns null, cannot deploy scripts");
+ } else {
+ File scriptServicesDirectory = getScriptServicesDirectory(axisConfig);
+ ScriptDeploymentEngine deploymentEngine = new ScriptDeploymentEngine(axisConfig);
+ deploymentEngine.loadRepository(scriptServicesDirectory);
+ deploymentEngine.loadServices();
+ }
log.info("script module activated");
}
Modified: webservices/axis2/branches/java/jaxws21/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java Thu Aug 9 08:14:52 2007
@@ -47,7 +47,7 @@
}
}
- wsInfoList.addWSInfoItem(null, deploymentEngine.getModuleDeployer(), WSInfo.TYPE_CUSTOM);
+// wsInfoList.addWSInfoItem(null, deploymentEngine.getModuleDeployer(), WSInfo.TYPE_CUSTOM);
}
/*
Modified: webservices/axis2/branches/java/jaxws21/modules/soapmonitor/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/soapmonitor/pom.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/soapmonitor/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/soapmonitor/pom.xml Thu Aug 9 08:14:52 2007
@@ -72,6 +72,28 @@
<skip>false</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process-classes</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <echo message="Creating soapmonitor jar..."/>
+ <jar destfile="${pom.basedir}/target/${project.build.finalName}.jar"
+ basedir="${pom.basedir}/target/classes"
+ excludes="**/module.xml,*handlers*,**/*Module*,**/*Handler*"
+ />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/build.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/build.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/build.xml Thu Aug 9 08:14:52 2007
@@ -47,8 +47,8 @@
<property name="tool_docs_version" value="1_3"></property>
<property name="codegen.resource.dir" value="../conf/codegen"></property>
- <property name="codegen.help.resource.file" value="../../../xdocs/tools/${tool_docs_version}/eclipse/wsdl2java-plugin.html"></property>
- <property name="codegen.help.images.dir" value="../../../xdocs/tools/${tool_docs_version}/eclipse/images"></property>
+ <property name="codegen.help.resource.file" value="../../../modules/documentation/xdocs/tools/${tool_docs_version}/eclipse/wsdl2java-plugin.html"></property>
+ <property name="codegen.help.images.dir" value="../../../modules/documentation/xdocs/tools/${tool_docs_version}/eclipse/images"></property>
<property name="axis2.lib.dir" value="../../../target/lib"></property>
<!--Filter tockens for the copy command to filter the versions of external dependencies -->
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml Thu Aug 9 08:14:52 2007
@@ -47,7 +47,11 @@
<include>org.apache.ws.commons.schema:XmlSchema:jar</include>
<include>log4j:log4j:jar</include>
<include>org.apache.woden:woden:jar</include>
- <include>ant:ant:jar</include>
+ <include>commons-httpclient:commons-httpclient:jar</include>
+ <include>commons-codec:commons-codec:jar</include>
+ <include>jibx:jibx-bind:jar</include>
+ <include>jibx:jibx-run::jar</include>
+ <include>org.apache.ant:ant:jar</include>
</includes>
</dependencySet>
</dependencySets>
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Thu Aug 9 08:14:52 2007
@@ -141,72 +141,110 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>${geronimo.spec.activation.version}</version>
</dependency>
<dependency>
<groupId>annogen</groupId>
<artifactId>annogen</artifactId>
+ <version>${annogen.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-codegen</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb-codegen</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-java2wsdl</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb</artifactId>
+ <artifactId>axis2</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-codegen</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb-codegen</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-java2wsdl</artifactId>
+ <version>${version}</version>
+ </dependency>
<dependency>
<groupId>${stax.impl.groupid}</groupId>
<artifactId>${stax.impl.artifactid}</artifactId>
+ <version>${stax.impl.version}</version>
</dependency>
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
+ <version>${neethi.version}</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
+ <version>${xbean.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
+ <version>${xmlschema.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
+ <version>${ant.version}</version>
</dependency>
<dependency>
<groupId>org.apache.woden</groupId>
<artifactId>woden</artifactId>
+ <version>${woden.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons.httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons.codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jibx</groupId>
+ <artifactId>jibx-bind</artifactId>
+ <version>${jibx.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ <version>${jibx.version}</version>
+ </dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
</dependencies>
<distributionManagement>
@@ -257,7 +295,7 @@
<phase>package</phase>
<configuration>
<tasks>
- <property name="codegen.plugin.version" value="Axis2_Codegen_Wizard_1.2.0"/>
+ <property name="codegen.plugin.version" value="Axis2_Codegen_Wizard_${eclipse.plugins.version}"/>
<property name="codegen.plugin.zip.name" value="axis2-eclipse-codegen-wizard.zip"/>
<property name="codegen.plugin.jar.name" value="Axis2CodegenWizard.jar"/>
<property name="src" value="./src"/>
@@ -276,8 +314,8 @@
<property name="plugin.classpath.file.name" value=".classpath"/>
<property name="plugin.help.file.name" value="help_toc.xml"/>
<property name="codegen.resource.dir" value="../conf/codegen"/>
- <property name="codegen.help.resource.file" value="../../../xdocs/tools/1_3/eclipse/wsdl2java-plugin.html"/>
- <property name="codegen.help.images.dir" value="../../../xdocs/tools/1_3/eclipse/images"/>
+ <property name="codegen.help.resource.file" value="../../../modules/documentation/xdocs/tools/1_3/eclipse/wsdl2java-plugin.html"/>
+ <property name="codegen.help.images.dir" value="../../../modules/documentation/xdocs/tools/1_3/eclipse/images"/>
<property name="axis2.lib.dir" value="../../../target/lib"/>
<property name="codegen.resource.dir" value="../conf/codegen"/>
<delete dir="./target/plugin/${codegen.plugin.version}"/>
@@ -285,8 +323,9 @@
<delete dir="./target/dist"/>
<mkdir dir="./target/dist"/>
<!--Filter tockens for the copy command to filter the versions of external dependencies -->
- <filter token="version_number" value="${version_number}" />
- <filter token="activation.version" value="${activation.version}" />
+ <filter token="eclipse.plugins.version" value="${eclipse.plugins.version}" />
+ <filter token="version" value="${version}" />
+ <filter token="geronimo.spec.activation.version" value="${geronimo.spec.activation.version}" />
<filter token="annogen.version" value="${annogen.version}" />
<filter token="ant.version" value="${ant.version}" />
<filter token="axiom.version" value="${axiom.version}" />
@@ -295,7 +334,7 @@
<filter token="stax.api.version" value="${stax.api.version}" />
<filter token="stax.impl.version" value="${stax.impl.version}" />
<filter token="xbean.version" value="${xbean.version}" />
- <filter token="XmlSchema.version" value="${XmlSchema.version}" />
+ <filter token="xmlschema.version" value="${xmlschema.version}" />
<filter token="log4j.version" value="${log4j.version}" />
<filter token="wsdl4j.version" value="${wsdl4j.version}" />
<filter token="woden.version" value="${woden.version}" />
@@ -304,8 +343,7 @@
<filter token="jibx.version" value="${jibx.version}" />
<unzip src="./target/axis2.eclipse.codegen.plugin-${pom.version}.jar" dest="./target/plugin/${codegen.plugin.version}"/>
- <!-- Copy to the same position with the filtering on-->
- <!-- Copy to the same position with the filtering on-->
+ <!-- Copy to the same position with the filtering on-->
<copy todir="./target/plugin/${codegen.plugin.version}" filtering="on">
<fileset dir="${codegen.resource.dir}">
<include name="plugin.xml"/>
@@ -327,6 +365,14 @@
<copy todir="./target/plugin/${codegen.plugin.version}/${icons.dir.name}">
<fileset dir="${codegen.resource.dir}/${icons.dir.name}"/>
</copy>
+ <!-- copy the lib files -->
+ <mkdir dir="./target/plugin/temp"/>
+ <unzip src="./target/dist-axis2-eclipse-codege-plugin.zip" dest="./target/plugin/temp"/>
+ <mkdir dir="./target/plugin/${codegen.plugin.version}/lib"/>
+ <copy todir="./target/plugin/${codegen.plugin.version}/lib">
+ <fileset dir="./target/plugin/temp/lib"/>
+ </copy>
+ <delete dir="./target/plugin/temp"/>
<!-- copy the other project files-->
<copy todir="./target/plugin/${codegen.plugin.version}">
<fileset file="${codegen.resource.dir}/${plugin.project.file.name}"/>
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java Thu Aug 9 08:14:52 2007
@@ -43,6 +43,6 @@
public static final String LIB = "lib" ;
public static final String TARGET = "target" ;
public static final String PLUGINS = "plugins" ;
- public static final String AXIS_CODEGEN_PLUGIN_FOLDER = "Axis2_Codegen_Wizard_1.2.0" ;
+ public static final String AXIS_CODEGEN_PLUGIN_FOLDER = "Axis2_Codegen_Wizard_1.3.0" ;
}
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/build.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/build.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/build.xml Thu Aug 9 08:14:52 2007
@@ -47,8 +47,8 @@
<property name="tool_docs_version" value="1_3"></property>
<property name="service.resource.dir" value="../conf/service"></property>
- <property name="service.help.resource.file" value="../../../xdocs/tools/${tool_docs_version}/eclipse/servicearchiver-plugin.html"></property>
- <property name="service.help.images.dir" value="../../../xdocs/tools/${tool_docs_version}/eclipse/images"></property>
+ <property name="service.help.resource.file" value="../../../modules/documentation/xdocs/tools/${tool_docs_version}/eclipse/servicearchiver-plugin.html"></property>
+ <property name="service.help.images.dir" value="../../../modules/documentation/xdocs/tools/${tool_docs_version}/eclipse/images"></property>
<property name="axis2.lib.dir" value="../../../target/lib"></property>
<!--Filter tockens for the copy command to filter the versions of external dependencies -->
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml Thu Aug 9 08:14:52 2007
@@ -17,7 +17,7 @@
~ under the License.
-->
<assembly>
- <id>axis2-service-codege-plugin</id>
+ <id>axis2-eclipse-service-plugin</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
@@ -35,7 +35,7 @@
<include>commons-logging:commons-logging:jar</include>
<include>org.apache.axis2:axis2:jar</include>
<include>log4j:log4j:jar</include>
- <include>ant:ant:jar</include>
+ <include>org.apache.ant:ant:jar</include>
</includes>
</dependencySet>
</dependencySets>
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml Thu Aug 9 08:14:52 2007
@@ -32,22 +32,22 @@
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
+ <artifactId>axis2</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-codegen</artifactId>
+ <artifactId>axis2-java2wsdl</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb-codegen</artifactId>
+ <artifactId>axis2-codegen</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-java2wsdl</artifactId>
+ <artifactId>axis2-kernel</artifactId>
<version>${version}</version>
</dependency>
<dependency>
@@ -56,6 +56,11 @@
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb-codegen</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
@@ -207,7 +212,7 @@
<phase>package</phase>
<configuration>
<tasks>
- <property name="service.plugin.version" value="Axis2_Service_Archiver_1.0.0"/>
+ <property name="service.plugin.version" value="Axis2_Service_Archiver_${eclipse.plugins.version}"/>
<property name="service.plugin.zip.name" value="axis2-eclipse-service-archiver-wizard.zip"/>
<property name="service.plugin.jar.name" value="Axis_Service_Archiver.jar"/>
<property name="src" value="./src"/>
@@ -226,19 +231,20 @@
<property name="plugin.classpath.file.name" value=".classpath"/>
<property name="plugin.help.file.name" value="help_toc.xml"/>
<property name="service.resource.dir" value="../conf/service"/>
- <property name="service.help.resource.file" value="../../../xdocs/tools/1_3/eclipse/servicearchiver-plugin.html"/>
- <property name="service.help.images.dir" value="../../../xdocs/tools/1_3/eclipse/images"/>
+ <property name="service.help.resource.file" value="../../../modules/documentation/xdocs/tools/1_3/eclipse/servicearchiver-plugin.html"/>
+ <property name="service.help.images.dir" value="../../../modules/documentation/xdocs/tools/1_3/eclipse/images"/>
<property name="axis2.lib.dir" value="../../../target/lib"/>
<!--Filter tockens for the copy command to filter the versions of external dependencies -->
- <filter token="version_number" value="${version_number}"/>
+ <filter token="version" value="${version}"/>
+ <filter token="eclipse.plugins.version" value="${eclipse.plugins.version}"/>
<filter token="ant.version" value="${ant.version}"/>
<filter token="commons.logging.version" value="${commons.logging.version}"/>
- <filter token="log4j.version" value="1.2.14"/>
+ <filter token="log4j.version" value="${log4j.version}"/>
<delete dir="./target/plugin/${service.plugin.version}"/>
<mkdir dir="./target/plugin/${service.plugin.version}"/>
<delete dir="./target/dist"/>
<mkdir dir="./target/dist"/>
- <unzip src="./target/axis2.eclipse.service.plugin-${pom.version}.jar" dest="./target/plugin/${service.plugin.version}"/>
+ <unzip src="./target/axis2.eclipse.service.plugin-${version}.jar" dest="./target/plugin/${service.plugin.version}"/>
<!-- Copy to the same position with the filtering on-->
<copy todir="./target/plugin/${service.plugin.version}" filtering="on">
<fileset dir="${service.resource.dir}">
@@ -261,6 +267,15 @@
<copy todir="./target/plugin/${service.plugin.version}/${icons.dir.name}">
<fileset dir="${service.resource.dir}/${icons.dir.name}"/>
</copy>
+ <!-- copy the lib files -->
+ <mkdir dir="./target/plugin/temp"/>
+ <unzip src="./target/dist-axis2-eclipse-service-plugin.zip" dest="./target/plugin/temp"/>
+ <mkdir dir="./target/plugin/${service.plugin.version}/lib"/>
+ <copy todir="./target/plugin/${service.plugin.version}/lib">
+ <fileset dir="./target/plugin/temp/lib"/>
+ </copy>
+ <delete dir="./target/plugin/temp"/>
+
<!-- copy the other project files-->
<copy todir="./target/plugin/${service.plugin.version}">
<fileset file="${service.resource.dir}/${plugin.project.file.name}"/>
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml Thu Aug 9 08:14:52 2007
@@ -35,8 +35,18 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>commons-logging:commons-logging:jar</include>
+ <include>annogen:annogen:jar</include>
+ <include>org.apache.ws.commons.axiom:axiom-api:jar</include>
+ <include>org.apache.ws.commons.axiom:axiom-dom:jar</include>
+ <include>org.apache.ws.commons.axiom:axiom-impl:jar</include>
+ <include>org.codehaus.woodstox:wstx-asl:jar</include>
+ <include>org.apache.neethi:neethi:jar</include>
+ <include>stax:stax-api:jar</include>
+ <include>xmlbeans:xbean:jar</include>
+ <include>org.apache.ws.commons.schema:XmlSchema:jar</include>
<include>log4j:log4j:jar</include>
+ <include>org.apache.woden:woden:jar</include>
+ <include>commons-logging:commons-logging:jar</include>
<include>org.apache.ant:ant:jar</include>
<include>org.apache.axis2:axis2-codegen:jar</include>
<include>org.apache.axis2:axis2-kernel:jar</include>
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/pom.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/pom.xml Thu Aug 9 08:14:52 2007
@@ -101,6 +101,22 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/ValidateXMLFile.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/ValidateXMLFile.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/ValidateXMLFile.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/ValidateXMLFile.java Thu Aug 9 08:14:52 2007
@@ -23,7 +23,6 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
-import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
@@ -34,19 +33,17 @@
import java.io.StringReader;
-
+/**
+ * this calss used for check service xml validation
+ */
public class ValidateXMLFile {
-
- /**
- * this calss used for check service xml validation
- */
-
+ public final String W3C_XML_SCHEMA_NS_URI = "http://www.w3.org/2001/XMLSchema";
public boolean Validate(String args) {
try {
// define the type of schema get validation driver:
- SchemaFactory schemafactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ SchemaFactory schemafactory = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI);
// create schema by reading it from an XSD file:
java.net.URL resource = WizardPanel.class.getResource("/resources/service.xsd");
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml Thu Aug 9 08:14:52 2007
@@ -42,6 +42,11 @@
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java Thu Aug 9 08:14:52 2007
@@ -97,7 +97,7 @@
/**
* Name of the service file, which is being generated.
- * @parameter expression="${axis2.java2wsdl.outputFileName}" default-value="${project.build.outputDirectory}/generated-resources/java2wsdl/service.xml"
+ * @parameter expression="${axis2.java2wsdl.outputFileName}" default-value="${project.build.directory}/generated-resources/service.wsdl"
*/
private String outputFileName;
@@ -213,8 +213,11 @@
addToOptionMap( optionMap,
Java2WSDLConstants.SERVICE_NAME_OPTION,
serviceName);
- File f = new File(project.getBasedir(), outputFileName);
- File dir = f.getParentFile();
+ File outputFile = new File(outputFileName);
+ if(!outputFile.isAbsolute()){
+ outputFile = new File(project.getBasedir(), outputFileName);
+ }
+ File dir = outputFile.getParentFile();
if (!dir.isDirectory()) {
dir.mkdirs();
}
@@ -223,7 +226,7 @@
dir.getPath() );
addToOptionMap( optionMap,
Java2WSDLConstants.OUTPUT_FILENAME_OPTION,
- f.getName() );
+ outputFile.getName() );
Set artifacts = project.getArtifacts();
String[] artifactFileNames = new String[artifacts.size() + 1];
@@ -237,45 +240,65 @@
Java2WSDLConstants.CLASSPATH_OPTION,
artifactFileNames);
- addToOptionMap(optionMap,
- Java2WSDLConstants.STYLE_OPTION,
- style);
-
- addToOptionMap(optionMap,
- Java2WSDLConstants.USE_OPTION,
- use);
-
- addToOptionMap(optionMap,
- Java2WSDLConstants.WSDL_VERSION_OPTION,
- wsdlVersion);
-
- addToOptionMap(optionMap,
- Java2WSDLConstants.DOC_LIT_BARE,
- docLitBare);
-
- addToOptionMap(optionMap,
- Java2WSDLConstants.LOCATION_OPTION,
- locationUri);
-
- addToOptionMap(optionMap,
- Java2WSDLConstants.NAMESPACE_GENERATOR_OPTION,
- nsGenClassName);
-
- addToOptionMap(optionMap,
- Java2WSDLConstants.SCHEMA_GENERATOR_OPTION,
- schemaGenClassName);
-
- addToOptionMap(optionMap,
- Java2WSDLConstants.ATTR_FORM_DEFAULT_OPTION,
- attrFormDefault);
-
- addToOptionMap(optionMap,
- Java2WSDLConstants.ELEMENT_FORM_DEFAULT_OPTION,
- elementFormDefault);
-
- addToOptionMap(optionMap,
- Java2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION,
- extraClasses);
+ if (style != null) {
+ addToOptionMap(optionMap,
+ Java2WSDLConstants.STYLE_OPTION,
+ style);
+ }
+
+ if (use != null) {
+ addToOptionMap(optionMap,
+ Java2WSDLConstants.USE_OPTION,
+ use);
+ }
+
+ if (wsdlVersion != null) {
+ addToOptionMap(optionMap,
+ Java2WSDLConstants.WSDL_VERSION_OPTION,
+ wsdlVersion);
+ }
+
+ if (docLitBare != null) {
+ addToOptionMap(optionMap,
+ Java2WSDLConstants.DOC_LIT_BARE,
+ docLitBare);
+ }
+
+ if (locationUri != null) {
+ addToOptionMap(optionMap,
+ Java2WSDLConstants.LOCATION_OPTION,
+ locationUri);
+ }
+
+ if (nsGenClassName != null) {
+ addToOptionMap(optionMap,
+ Java2WSDLConstants.NAMESPACE_GENERATOR_OPTION,
+ nsGenClassName);
+ }
+
+ if (schemaGenClassName != null) {
+ addToOptionMap(optionMap,
+ Java2WSDLConstants.SCHEMA_GENERATOR_OPTION,
+ schemaGenClassName);
+ }
+
+ if (attrFormDefault != null) {
+ addToOptionMap(optionMap,
+ Java2WSDLConstants.ATTR_FORM_DEFAULT_OPTION,
+ attrFormDefault);
+ }
+
+ if (elementFormDefault != null) {
+ addToOptionMap(optionMap,
+ Java2WSDLConstants.ELEMENT_FORM_DEFAULT_OPTION,
+ elementFormDefault);
+ }
+
+ if (extraClasses != null && extraClasses.length > 0) {
+ addToOptionMap(optionMap,
+ Java2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION,
+ extraClasses);
+ }
ArrayList list = new ArrayList();
Iterator iterator = package2Namespace.entrySet().iterator();
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/.classpath
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/.classpath?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/.classpath (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/.classpath Thu Aug 9 08:14:52 2007
@@ -3,12 +3,12 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="lib" path="lib/activation-@activation.version@.jar"/>
+ <classpathentry kind="lib" path="lib/geronimo-activation_1.1_spec-@activation.version@.jar"/>
<classpathentry kind="lib" path="lib/annogen-@annogen.version@.jar"/>
<classpathentry kind="lib" path="lib/axiom-api-@axiom.version@.jar"/>
<classpathentry kind="lib" path="lib/axiom-dom-@axiom.version@.jar"/>
<classpathentry kind="lib" path="lib/axiom-impl-@axiom.version@.jar"/>
- <classpathentry kind="lib" path="lib/axis2-@version_number@.jar"/>
+ <classpathentry kind="lib" path="lib/axis2-@version@.jar"/>
<classpathentry kind="lib" path="lib/commons-logging-@commons.logging.version@.jar"/>
<classpathentry kind="lib" path="lib/log4j-@log4j.version@.jar"/>
<classpathentry kind="lib" path="lib/neethi-@neethi.version@.jar"/>
@@ -20,7 +20,7 @@
<classpathentry kind="lib" path="lib/XmlSchema-@XmlSchema.version@.jar"/>
<classpathentry kind="lib" path="lib/commons-httpclient-@commons.httpclient.version@.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-@commons.codec.version@.jar"/>
- <classpathentry kind="lib" path="lib/axis2-jibx@version_number@.jar"/>
+ <classpathentry kind="lib" path="lib/axis2-jibx@version@.jar"/>
<classpathentry kind="lib" path="lib/jibx-bind-@jibx.version@.jar"/>
<classpathentry kind="lib" path="lib/jibx-run-@jibx.version@.jar"/>
<classpathentry kind="output" path="bin"/>
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/build.properties?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/build.properties (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/build.properties Thu Aug 9 08:14:52 2007
@@ -25,13 +25,13 @@
help/,\
lib/,\
src/,\
- lib/activation-@activation.version@.jar,\
+ lib/geronimo-activation_1.1_spec-@geronimo.spec.activation.version@.jar,\
lib/annogen-@annogen.version@.jar,\
lib/ant-@ant.version@.jar,\
lib/axiom-api-@axiom.version@.jar,\
lib/axiom-dom-@axiom.version@.jar,\
lib/axiom-impl-@axiom.version@.jar,\
- lib/axis2-@version_number@.jar,\
+ lib/axis2-@version@.jar,\
lib/commons-logging-@commons.logging.version@.jar,\
lib/log4j-@log4j.version@.jar,\
lib/neethi-@neethi.version@.jar,\
@@ -39,11 +39,10 @@
lib/wsdl4j-@wsdl4j.version@.jar,\
lib/wstx-@stax.impl.version@.jar,\
lib/xbean-@xbean.version@.jar,\
- lib/XmlSchema-@XmlSchema.version@.jar,\
+ lib/XmlSchema-@xmlschema.version@.jar,\
lib/woden-@woden.version@.jar,\
lib/commons-httpclient-@commons.httpclient.version@.jar,\
lib/commons-codec-@commons.codec.version@.jar,\
- lib/axis2-jibx-@version_number@.jar,\
lib/jibx-bind-@jibx.version@.jar,\
lib/jibx-run-@jibx.version@.jar,\
src.includes = icons/,\
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/plugin.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/plugin.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/plugin.xml Thu Aug 9 08:14:52 2007
@@ -21,7 +21,7 @@
<plugin
id="Axis2_Codegen_Wizard"
name="Axis2 Codegen Wizard Plug-in"
- version="@version_number@"
+ version="@eclipse.plugins.version@"
provider-name="Apache Software Foundation"
class="org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin">
@@ -29,7 +29,7 @@
<library name="Axis2CodegenWizard.jar">
<export name="*"/>
</library>
- <library name="lib/activation-@activation.version@.jar">
+ <library name="lib/geronimo-activation_1.1_spec-@geronimo.spec.activation.version@.jar">
<export name="*"/>
</library>
<library name="lib/annogen-@annogen.version@.jar">
@@ -50,7 +50,7 @@
<library name="lib/commons-logging-@commons.logging.version@.jar">
<export name="*"/>
</library>
- <library name="lib/axis2-@version_number@.jar">
+ <library name="lib/axis2-@version@.jar">
<export name="*"/>
</library>
<library name="lib/log4j-@log4j.version@.jar">
@@ -65,13 +65,13 @@
<library name="lib/wsdl4j-@wsdl4j.version@.jar">
<export name="*"/>
</library>
- <library name="lib/wstx-@stax.impl.version@.jar">
+ <library name="lib/wstx-asl-@stax.impl.version@.jar">
<export name="*"/>
</library>
<library name="lib/xbean-@xbean.version@.jar">
<export name="*"/>
</library>
- <library name="lib/XmlSchema-@XmlSchema.version@.jar">
+ <library name="lib/XmlSchema-@xmlschema.version@.jar">
<export name="*"/>
</library>
<library name="lib/woden-@woden.version@.jar">
@@ -81,9 +81,6 @@
<export name="*"/>
</library>
<library name="lib/commons-codec-@commons.codec.version@.jar">
- <export name="*"/>
- </library>
- <library name="lib/axis2-jibx-@version_number@.jar">
<export name="*"/>
</library>
<library name="lib/jibx-bind-@jibx.version@.jar">
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/conf/service/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/conf/service/build.properties?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/conf/service/build.properties (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/conf/service/build.properties Thu Aug 9 08:14:52 2007
@@ -24,7 +24,7 @@
help/,\
lib/,\
src/,\
- lib/axis2-@version_number@.jar,\
+ lib/axis2-@version@.jar,\
lib/commons-logging-@commons.logging.version@.jar,\
lib/log4j-@log4j.version@.jar,\
lib/ant-@ant.version@.jar,\
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/conf/service/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/conf/service/plugin.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/conf/service/plugin.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/conf/service/plugin.xml Thu Aug 9 08:14:52 2007
@@ -21,7 +21,7 @@
<plugin
id="Axis2_Service_Archiver"
name="Axis2 Service Maker"
- version="@version_number@"
+ version="@eclipse.plugins.version@"
provider-name="Apache Software Foundation"
class="org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver">
@@ -29,7 +29,7 @@
<library name="Axis_Service_Archiver.jar">
<export name="*"/>
</library>
- <library name="lib/axis2-@version_number@.jar">
+ <library name="lib/axis2-@version@.jar">
<export name="*"/>
</library>
<library name="lib/commons-logging-@commons.logging.version@.jar">
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/script/java2wsdl.bat
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/script/java2wsdl.bat?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/script/java2wsdl.bat (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/script/java2wsdl.bat Thu Aug 9 08:14:52 2007
@@ -1,61 +1,76 @@
-@echo off
-rem ---------------------------------------------------------------------------
-rem Startup script for the WSDLJava
-rem
-rem Environment Variable Prequisites
-rem
-rem AXIS2_HOME Must point at your AXIS2 directory
-rem
-rem JAVA_HOME Must point at your Java Development Kit installation.
-rem
-rem JAVA_OPTS (Optional) Java runtime options
-rem ---------------------------------------------------------------------------
-set CURRENT_DIR=%cd%
-
-rem Make sure prerequisite environment variables are set
-if not "%JAVA_HOME%" == "" goto gotJavaHome
-echo The JAVA_HOME environment variable is not defined
-echo This environment variable is needed to run this program
-goto end
-:gotJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-goto okJavaHome
-:noJavaHome
-echo The JAVA_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-echo NB: JAVA_HOME should point to a JDK/JRE
-goto end
-:okJavaHome
-
-rem check the AXIS2_HOME environment variable
-if not "%AXIS2_HOME%" == "" goto gotHome
-set AXIS2_HOME=%CURRENT_DIR%
-if exist "%AXIS2_HOME%\bin\start.bat" goto okHome
-
-rem guess the home. Jump one directory up to check if that is the home
-cd ..
-set AXIS2_HOME=%cd%
-cd %CURRENT_DIR%
-
-:gotHome
-if EXIST "%AXIS2_HOME%\lib\axis2*.jar" goto okHome
-echo The AXIS2_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-goto end
-
-:okHome
-rem set the classes
-setlocal EnableDelayedExpansion
-rem append the existing classpath to AXIS2_CLASS_PATH
-set AXIS2_CLASS_PATH=%CLASSPATH%;%AXIS2_HOME%
-rem loop through the libs and add them to the class path
-FOR %%c in ("%AXIS2_HOME%\lib\*.jar") DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
-
-rem ----- Execute The Requested Command ---------------------------------------
-echo Using AXIS2_HOME: %AXIS2_HOME%
-echo Using JAVA_HOME: %JAVA_HOME%
-set _RUNJAVA="%JAVA_HOME%\bin\java"
-
-%_RUNJAVA% %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" org.apache.ws.java2wsdl.Java2WSDL %*
-endlocal
-:end
+@echo off
+
+REM Copyright 2001,2004-2005 The Apache Software Foundation
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+rem ---------------------------------------------------------------------------
+rem Startup script for the WSDLJava
+rem
+rem Environment Variable Prequisites
+rem
+rem AXIS2_HOME Must point at your AXIS2 directory
+rem
+rem JAVA_HOME Must point at your Java Development Kit installation.
+rem
+rem JAVA_OPTS (Optional) Java runtime options
+rem ---------------------------------------------------------------------------
+set CURRENT_DIR=%cd%
+
+rem Make sure prerequisite environment variables are set
+if not "%JAVA_HOME%" == "" goto gotJavaHome
+echo The JAVA_HOME environment variable is not defined
+echo This environment variable is needed to run this program
+goto end
+:gotJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto okJavaHome
+:noJavaHome
+echo The JAVA_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+echo NB: JAVA_HOME should point to a JDK/JRE
+goto end
+:okJavaHome
+
+rem check the AXIS2_HOME environment variable
+if not "%AXIS2_HOME%" == "" goto gotHome
+set AXIS2_HOME=%CURRENT_DIR%
+if exist "%AXIS2_HOME%\bin\start.bat" goto okHome
+
+rem guess the home. Jump one directory up to check if that is the home
+cd ..
+set AXIS2_HOME=%cd%
+cd %CURRENT_DIR%
+
+:gotHome
+if EXIST "%AXIS2_HOME%\lib\axis2*.jar" goto okHome
+echo The AXIS2_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+
+:okHome
+rem set the classes
+setlocal EnableDelayedExpansion
+rem append the existing classpath to AXIS2_CLASS_PATH
+set AXIS2_CLASS_PATH=%CLASSPATH%;%AXIS2_HOME%
+rem loop through the libs and add them to the class path
+FOR %%c in ("%AXIS2_HOME%\lib\*.jar") DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
+
+rem ----- Execute The Requested Command ---------------------------------------
+echo Using AXIS2_HOME: %AXIS2_HOME%
+echo Using JAVA_HOME: %JAVA_HOME%
+set _RUNJAVA="%JAVA_HOME%\bin\java"
+
+%_RUNJAVA% %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" org.apache.ws.java2wsdl.Java2WSDL %*
+endlocal
+:end
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/script/setenv.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/script/setenv.sh?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/script/setenv.sh (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/script/setenv.sh Thu Aug 9 08:14:52 2007
@@ -85,7 +85,7 @@
do
AXIS2_CLASSPATH="$AXIS2_CLASSPATH":$f
done
-AXIS2_CLASSPATH="$JAVA_HOME/lib/tools.jar":"$AXIS2_CLASSPATH":"$CLASSPATH"
+AXIS2_CLASSPATH="$AXIS2_HOME":"$JAVA_HOME/lib/tools.jar":"$AXIS2_CLASSPATH":"$CLASSPATH"
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/script/wsdl2java.bat
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/script/wsdl2java.bat?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/script/wsdl2java.bat (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/script/wsdl2java.bat Thu Aug 9 08:14:52 2007
@@ -1,60 +1,75 @@
-@echo off
-rem ---------------------------------------------------------------------------
-rem Startup script for the WSDLJava
-rem
-rem Environment Variable Prequisites
-rem
-rem AXIS2_HOME Must point at your AXIS2 directory
-rem
-rem JAVA_HOME Must point at your Java Development Kit installation.
-rem
-rem JAVA_OPTS (Optional) Java runtime options
-rem ---------------------------------------------------------------------------
-set CURRENT_DIR=%cd%
-
-rem Make sure prerequisite environment variables are set
-if not "%JAVA_HOME%" == "" goto gotJavaHome
-echo The JAVA_HOME environment variable is not defined
-echo This environment variable is needed to run this program
-goto end
-:gotJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-goto okJavaHome
-:noJavaHome
-echo The JAVA_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-echo NB: JAVA_HOME should point to a JDK/JRE
-goto end
-:okJavaHome
-
-rem check the AXIS2_HOME environment variable
-if not "%AXIS2_HOME%" == "" goto gotHome
-set AXIS2_HOME=%CURRENT_DIR%
-if exist "%AXIS2_HOME%\bin\start.bat" goto okHome
-
-rem guess the home. Jump one directory up to check if that is the home
-cd ..
-set AXIS2_HOME=%cd%
-cd %CURRENT_DIR%
-
-:gotHome
-if EXIST "%AXIS2_HOME%\lib\axis2*.jar" goto okHome
-echo The AXIS2_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-goto end
-
-:okHome
-rem set the classes
-setlocal EnableDelayedExpansion
-rem loop through the libs and add them to the class path
-set AXIS2_CLASS_PATH=%AXIS2_HOME%
-FOR %%c in ("%AXIS2_HOME%\lib\*.jar") DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
-
-rem ----- Execute The Requested Command ---------------------------------------
-echo Using AXIS2_HOME: %AXIS2_HOME%
-echo Using JAVA_HOME: %JAVA_HOME%
-set _RUNJAVA="%JAVA_HOME%\bin\java"
-
-%_RUNJAVA% %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" org.apache.axis2.wsdl.WSDL2Java %*
-endlocal
-:end
+@echo off
+
+REM Copyright 2001,2004-2005 The Apache Software Foundation
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+rem ---------------------------------------------------------------------------
+rem Startup script for the WSDLJava
+rem
+rem Environment Variable Prequisites
+rem
+rem AXIS2_HOME Must point at your AXIS2 directory
+rem
+rem JAVA_HOME Must point at your Java Development Kit installation.
+rem
+rem JAVA_OPTS (Optional) Java runtime options
+rem ---------------------------------------------------------------------------
+set CURRENT_DIR=%cd%
+
+rem Make sure prerequisite environment variables are set
+if not "%JAVA_HOME%" == "" goto gotJavaHome
+echo The JAVA_HOME environment variable is not defined
+echo This environment variable is needed to run this program
+goto end
+:gotJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto okJavaHome
+:noJavaHome
+echo The JAVA_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+echo NB: JAVA_HOME should point to a JDK/JRE
+goto end
+:okJavaHome
+
+rem check the AXIS2_HOME environment variable
+if not "%AXIS2_HOME%" == "" goto gotHome
+set AXIS2_HOME=%CURRENT_DIR%
+if exist "%AXIS2_HOME%\bin\start.bat" goto okHome
+
+rem guess the home. Jump one directory up to check if that is the home
+cd ..
+set AXIS2_HOME=%cd%
+cd %CURRENT_DIR%
+
+:gotHome
+if EXIST "%AXIS2_HOME%\lib\axis2*.jar" goto okHome
+echo The AXIS2_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+
+:okHome
+rem set the classes
+setlocal EnableDelayedExpansion
+rem loop through the libs and add them to the class path
+set AXIS2_CLASS_PATH=%AXIS2_HOME%
+FOR %%c in ("%AXIS2_HOME%\lib\*.jar") DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
+
+rem ----- Execute The Requested Command ---------------------------------------
+echo Using AXIS2_HOME: %AXIS2_HOME%
+echo Using JAVA_HOME: %JAVA_HOME%
+set _RUNJAVA="%JAVA_HOME%\bin\java"
+
+%_RUNJAVA% %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" org.apache.axis2.wsdl.WSDL2Java %*
+endlocal
+:end
Modified: webservices/axis2/branches/java/jaxws21/modules/webapp/conf/modules.list
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/webapp/conf/modules.list?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/webapp/conf/modules.list (original)
+++ webservices/axis2/branches/java/jaxws21/modules/webapp/conf/modules.list Thu Aug 9 08:14:52 2007
@@ -1,2 +1,23 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
addressing-@version@.mar
soapmonitor-@version@.mar
+ping-@version@.mar
+mex-@version@.mar
+axis2-scripting-@version@.mar
\ No newline at end of file
Modified: webservices/axis2/branches/java/jaxws21/modules/webapp/conf/services.list
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/webapp/conf/services.list?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/webapp/conf/services.list (original)
+++ webservices/axis2/branches/java/jaxws21/modules/webapp/conf/services.list Thu Aug 9 08:14:52 2007
@@ -1 +1,19 @@
-version-@version@.aar
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+version-@version@.aar
Modified: webservices/axis2/branches/java/jaxws21/modules/webapp/conf/web.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/webapp/conf/web.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/webapp/conf/web.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/webapp/conf/web.xml Thu Aug 9 08:14:52 2007
@@ -64,6 +64,11 @@
<url-pattern>/axis2-admin/*</url-pattern>
</servlet-mapping>
+ <mime-mapping>
+ <extension>inc</extension>
+ <mime-type>text/plain</mime-type>
+ </mime-mapping>
+
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org