[jboss-svn-commits] JBossWS SVN: r840 - in branches/jbossws-1.0: . src/main/java/org/jboss/ws/integration/other src/main/java/org/jboss/ws/tools src/test/java/org/jboss/test/ws
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 28 06:10:40 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-08-28 06:10:29 -0400 (Mon, 28 Aug 2006)
New Revision: 840
Added:
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/other/wspublish.java
Removed:
branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/wspublish.java
Modified:
branches/jbossws-1.0/build.xml
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/other/GenericServiceEndpointPublisher.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/TomcatTestDeployer.java
Log:
Fix compile-core classpath
Modified: branches/jbossws-1.0/build.xml
===================================================================
--- branches/jbossws-1.0/build.xml 2006-08-28 09:56:38 UTC (rev 839)
+++ branches/jbossws-1.0/build.xml 2006-08-28 10:10:29 UTC (rev 840)
@@ -28,7 +28,6 @@
<property name="build.dir" value="${basedir}/output"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
<property name="build.classes14.dir" value="${build.dir}/classes14"/>
- <property name="build.classes14.noretro.dir" value="${build.dir}/classes14-noretro"/>
<property name="build.etc.dir" value="${build.dir}/etc"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
<property name="build.resources.dir" value="${build.dir}/resources"/>
@@ -123,8 +122,8 @@
<!-- Compile core java sources -->
<target name="compile-interfaces" depends="init">
- <mkdir dir="${build.classes14.noretro.dir}"/>
- <javac srcdir="${src.java.dir}" destdir="${build.classes14.noretro.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
+ <mkdir dir="${build.classes14.dir}"/>
+ <javac srcdir="${src.java.dir}" destdir="${build.classes14.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
<include name="javax/xml/rpc/**"/>
<include name="javax/xml/soap/**"/>
@@ -133,7 +132,7 @@
</target>
<!-- Compile core java sources -->
- <target name="compile-core" depends="init">
+ <target name="compile-core" depends="compile-interfaces">
<mkdir dir="${build.classes.dir}"/>
<javac srcdir="${src.java.dir}" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
@@ -144,13 +143,13 @@
<exclude name="org/jboss/ws/integration/**"/>
<exclude name="org/jboss/ws/transport/jms/**"/>
<exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.java"/>
- <classpath location="build.classes14.dir"/>
+ <classpath path="${build.classes14.dir}"/>
<classpath refid="core.classpath"/>
</javac>
</target>
<!-- Compile interation java sources -->
- <target name="compile-integration" depends="init">
+ <target name="compile-integration" depends="compile-core">
<mkdir dir="${build.classes.dir}"/>
<javac srcdir="${src.java.dir}" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
@@ -203,7 +202,7 @@
<!-- Build jboss-jaxrpc.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jboss-jaxrpc.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes14.noretro.dir}">
+ <fileset dir="${build.classes14.dir}">
<include name="javax/xml/rpc/**"/>
</fileset>
</jar>
@@ -211,7 +210,7 @@
<!-- Build jboss-saaj.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jboss-saaj.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes14.noretro.dir}">
+ <fileset dir="${build.classes14.dir}">
<include name="javax/xml/soap/**"/>
</fileset>
</jar>
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/other/GenericServiceEndpointPublisher.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/other/GenericServiceEndpointPublisher.java 2006-08-28 09:56:38 UTC (rev 839)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/other/GenericServiceEndpointPublisher.java 2006-08-28 10:10:29 UTC (rev 840)
@@ -34,7 +34,6 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.deployment.ServiceEndpointPublisher;
import org.jboss.ws.deployment.UnifiedDeploymentInfo;
-import org.jboss.ws.tools.wspublish;
/**
* Publish the HTTP service endpoint to Tomcat
Copied: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/other/wspublish.java (from rev 838, branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/wspublish.java)
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/wspublish.java 2006-08-27 12:00:34 UTC (rev 838)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/other/wspublish.java 2006-08-28 10:10:29 UTC (rev 840)
@@ -0,0 +1,142 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.integration.other;
+
+// $Id: ContextServlet.java 293 2006-05-08 16:31:50Z thomas.diesler at jboss.com $
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.jboss.logging.Logger;
+import org.jboss.util.file.JarUtils;
+
+/**
+ * Publish a standard portable J2EE web service endpoint
+ * to standalone Tomcat
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 15-May-2006
+ */
+public class wspublish
+{
+ // provide logging
+ protected final Logger log = Logger.getLogger(wspublish.class);
+
+ public static final String DEFAULT_TOMCAT_SERVICE_ENDPOINT_SERVLET = "org.jboss.ws.integration.other.GenericServiceEndpointServlet";
+
+ public URL process(URL warURL, File destDir, String servletName) throws IOException
+ {
+ if (warURL == null)
+ throw new IllegalArgumentException("Invalid war URL: " + warURL);
+
+ if (destDir == null || destDir.isDirectory() == false)
+ throw new IllegalArgumentException("Invalid destintion dir: " + destDir);
+
+ if (servletName == null)
+ servletName = DEFAULT_TOMCAT_SERVICE_ENDPOINT_SERVLET;
+
+ InputStream in = warURL.openStream();
+ String warName = new File(warURL.getFile()).getName();
+ File tmpDir = new File("./wspublish/" + warName);
+ tmpDir.mkdirs();
+
+ log.debug("Extracting war to: " + tmpDir);
+ JarUtils.unjar(in, tmpDir);
+ in.close();
+
+ GenericServiceEndpointPublisher publisher = new GenericServiceEndpointPublisher();
+ publisher.setServiceEndpointServlet(servletName);
+ publisher.rewriteWebXML(tmpDir.toURL());
+
+ File outFile = new File(destDir.getCanonicalPath() + "/" + warName);
+ outFile.getParentFile().mkdirs();
+
+ log.info("Writing war to: " + outFile.toURL());
+ FileOutputStream fos = new FileOutputStream(outFile);
+ JarUtils.jar(fos, tmpDir.listFiles());
+ fos.close();
+
+ return outFile.toURL();
+ }
+
+ public static void main(String[] args) throws Exception
+ {
+ URL warURL = null;
+ File destDir = null;
+ String servletName = null;
+
+ for (int i = 0; i < args.length; i++)
+ {
+ String arg = args[i];
+ if ("-url".equals(arg))
+ {
+ warURL = getURL(args[i + 1]);
+ i++;
+ }
+ else if ("-dest".equals(arg))
+ {
+ destDir = new File(args[i + 1]);
+ i++;
+ }
+ else if ("-servlet".equals(arg))
+ {
+ servletName = args[i + 1];
+ i++;
+ }
+ }
+
+ if (warURL == null || destDir == null)
+ {
+ System.out.println("Usage: wspublish -url warURL -dest webappsDir [-servlet servletName]");
+ System.exit(1);
+ }
+
+ // process the args
+ new wspublish().process(warURL, destDir, servletName);
+ }
+
+ private static URL getURL(String urlStr)
+ {
+ URL warURL = null;
+ try
+ {
+ warURL = new URL(urlStr);
+ }
+ catch (MalformedURLException ex)
+ {
+ // ignore
+ }
+ try
+ {
+ warURL = new File(urlStr).toURL();
+ }
+ catch (MalformedURLException ex)
+ {
+ // ignore
+ }
+ return warURL;
+ }
+}
Deleted: branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/wspublish.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/wspublish.java 2006-08-28 09:56:38 UTC (rev 839)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/wspublish.java 2006-08-28 10:10:29 UTC (rev 840)
@@ -1,143 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.tools;
-
-// $Id: ContextServlet.java 293 2006-05-08 16:31:50Z thomas.diesler at jboss.com $
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.jboss.logging.Logger;
-import org.jboss.util.file.JarUtils;
-import org.jboss.ws.integration.other.GenericServiceEndpointPublisher;
-
-/**
- * Publish a standard portable J2EE web service endpoint
- * to standalone Tomcat
- *
- * @author Thomas.Diesler at jboss.org
- * @since 15-May-2006
- */
-public class wspublish
-{
- // provide logging
- protected final Logger log = Logger.getLogger(wspublish.class);
-
- public static final String DEFAULT_TOMCAT_SERVICE_ENDPOINT_SERVLET = "org.jboss.ws.integration.other.GenericServiceEndpointServlet";
-
- public URL process(URL warURL, File destDir, String servletName) throws IOException
- {
- if (warURL == null)
- throw new IllegalArgumentException("Invalid war URL: " + warURL);
-
- if (destDir == null || destDir.isDirectory() == false)
- throw new IllegalArgumentException("Invalid destintion dir: " + destDir);
-
- if (servletName == null)
- servletName = DEFAULT_TOMCAT_SERVICE_ENDPOINT_SERVLET;
-
- InputStream in = warURL.openStream();
- String warName = new File(warURL.getFile()).getName();
- File tmpDir = new File("./wspublish/" + warName);
- tmpDir.mkdirs();
-
- log.debug("Extracting war to: " + tmpDir);
- JarUtils.unjar(in, tmpDir);
- in.close();
-
- GenericServiceEndpointPublisher publisher = new GenericServiceEndpointPublisher();
- publisher.setServiceEndpointServlet(servletName);
- publisher.rewriteWebXML(tmpDir.toURL());
-
- File outFile = new File(destDir.getCanonicalPath() + "/" + warName);
- outFile.getParentFile().mkdirs();
-
- log.info("Writing war to: " + outFile.toURL());
- FileOutputStream fos = new FileOutputStream(outFile);
- JarUtils.jar(fos, tmpDir.listFiles());
- fos.close();
-
- return outFile.toURL();
- }
-
- public static void main(String[] args) throws Exception
- {
- URL warURL = null;
- File destDir = null;
- String servletName = null;
-
- for (int i = 0; i < args.length; i++)
- {
- String arg = args[i];
- if ("-url".equals(arg))
- {
- warURL = getURL(args[i + 1]);
- i++;
- }
- else if ("-dest".equals(arg))
- {
- destDir = new File(args[i + 1]);
- i++;
- }
- else if ("-servlet".equals(arg))
- {
- servletName = args[i + 1];
- i++;
- }
- }
-
- if (warURL == null || destDir == null)
- {
- System.out.println("Usage: wspublish -url warURL -dest webappsDir [-servlet servletName]");
- System.exit(1);
- }
-
- // process the args
- new wspublish().process(warURL, destDir, servletName);
- }
-
- private static URL getURL(String urlStr)
- {
- URL warURL = null;
- try
- {
- warURL = new URL(urlStr);
- }
- catch (MalformedURLException ex)
- {
- // ignore
- }
- try
- {
- warURL = new File(urlStr).toURL();
- }
- catch (MalformedURLException ex)
- {
- // ignore
- }
- return warURL;
- }
-}
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/TomcatTestDeployer.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/TomcatTestDeployer.java 2006-08-28 09:56:38 UTC (rev 839)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/TomcatTestDeployer.java 2006-08-28 10:10:29 UTC (rev 840)
@@ -33,7 +33,7 @@
import java.util.Map;
import org.jboss.util.Base64;
-import org.jboss.ws.tools.wspublish;
+import org.jboss.ws.integration.other.wspublish;
/**
* A deployer that deploys to Tomcat
More information about the jboss-svn-commits
mailing list