JBossWS SVN: r1732 - trunk/integration-tomcat
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 08:05:56 -0500 (Fri, 22 Dec 2006)
New Revision: 1732
Modified:
trunk/integration-tomcat/build.xml
Log:
restructure build
Modified: trunk/integration-tomcat/build.xml
===================================================================
--- trunk/integration-tomcat/build.xml 2006-12-22 13:05:53 UTC (rev 1731)
+++ trunk/integration-tomcat/build.xml 2006-12-22 13:05:56 UTC (rev 1732)
@@ -15,13 +15,17 @@
<import file="${basedir}/../build/import/build-setup.xml"/>
<import file="${basedir}/../build/import/build-thirdparty.xml"/>
+ <import file="${basedir}/../jbossws/build.xml"/>
+ <property name="tomcat.src.dir" value="${integration.tomcat.dir}/src/main"/>
+ <property name="tomcat.java.dir" value="${tomcat.src.dir}/java"/>
+ <property name="tomcat.resources.dir" value="${tomcat.src.dir}/resources"/>
+ <property name="tomcat.output.dir" value="${integration.tomcat.dir}/output"/>
+ <property name="tomcat.output.classes.dir" value="${tomcat.output.dir}/classes"/>
+ <property name="tomcat.output.classes14.dir" value="${tomcat.output.dir}/classes14"/>
+ <property name="tomcat.output.lib.dir" value="${tomcat.output.dir}/lib"/>
+
<target name="tomcat-init" depends="prepare, thirdparty">
- <path id="core.classpath">
- <path refid="library.classpath"/>
- <path refid="jboss.core.classpath"/>
- <path path="${jbossws.dir}/output/lib/jbossws-client.jar"/>
- </path>
</target>
<!-- ================================================================== -->
@@ -39,15 +43,14 @@
<target name="tomcat-compile" depends="tomcat-init,tomcat-compile-classes,tomcat-compile-etc" description="Compile all source files."/>
<!-- Compile java sources -->
- <target name="tomcat-compile-classes" depends="tomcat-init">
- <mkdir dir="${output.classes.dir}"/>
- <ant antfile="${jbossws.dir}/build.xml" target="jbossws-jars" dir="${jbossws.dir}" inheritall="false"/>
- <javac srcdir="${integration.tomcat.dir}/src/main/java" sourcepath="" destdir="${output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <target name="tomcat-compile-classes" depends="tomcat-init,jbossws-compile">
+ <mkdir dir="${tomcat.output.classes.dir}"/>
+ <javac srcdir="${tomcat.java.dir}" sourcepath="" destdir="${tomcat.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<include name="org/jboss/ws/integration/tomcat/**"/>
- <classpath path="${output.classes14.dir}"/>
<classpath refid="tomcat.integration.classpath"/>
- <classpath refid="core.classpath"/>
+ <classpath path="${jbossws.output.classes14.dir}"/>
+ <classpath path="${jbossws.output.classes.dir}"/>
</javac>
</target>
@@ -71,15 +74,15 @@
<target name="tomcat-module-jars">
<!-- Build jbossws-tomcat-integration.jar -->
- <mkdir dir="${output.lib.dir}"/>
- <jar jarfile="${output.lib.dir}/jbossws-tomcat-integration.jar" manifest="${output.etc.dir}/default.mf">
- <fileset dir="${output.classes.dir}">
+ <mkdir dir="${tomcat.output.lib.dir}"/>
+ <jar jarfile="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${tomcat.output.classes.dir}">
<include name="org/jboss/ws/integration/tomcat/**"/>
</fileset>
</jar>
<!-- Build jbossws.war -->
- <war warfile="${output.lib.dir}/jbossws.war" webxml="${jbossws.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml">
+ <war warfile="${tomcat.output.lib.dir}/jbossws.war" webxml="${jbossws.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml">
<fileset dir="${jbossws.resources.dir}/jbossws.war">
<include name="index.html"/>
<include name="styles.css"/>
@@ -112,13 +115,13 @@
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/>
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/>
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mailapi.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jbossws-core.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jboss-jaxws.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jboss-saaj.jar" overwrite="true"/>
- <copy todir="${tomcat.webapps.dir}" file="${output.lib.dir}/jbossws.war" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${jbossws.output.lib.dir}/jbossws-core.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${jbossws.output.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${jbossws.output.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${jbossws.output.lib.dir}/jboss-jaxws.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${jbossws.output.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${jbossws.output.lib.dir}/jboss-saaj.jar" overwrite="true"/>
+ <copy todir="${tomcat.webapps.dir}" file="${tomcat.output.lib.dir}/jbossws.war" overwrite="true"/>
<delete dir="${tomcat.webapps.dir}/jbossws"/>
</target>
@@ -145,7 +148,7 @@
</target>
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${output.dir}"/>
+ <delete dir="${tomcat.output.dir}"/>
</target>
<target name="main" description="Executes the default target (most)." depends="most"/>
18 years, 2 months
- 1
- 0
JBossWS SVN: r1731 - trunk/build/import
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 08:05:53 -0500 (Fri, 22 Dec 2006)
New Revision: 1731
Modified:
trunk/build/import/build-thirdparty.xml
Log:
restructure build
Modified: trunk/build/import/build-thirdparty.xml
===================================================================
--- trunk/build/import/build-thirdparty.xml 2006-12-22 12:55:19 UTC (rev 1730)
+++ trunk/build/import/build-thirdparty.xml 2006-12-22 13:05:53 UTC (rev 1731)
@@ -134,6 +134,8 @@
<!-- The classpath for the jboss42 integration -->
<path id="tomcat.integration.classpath">
+ <path refid="library.classpath"/>
+ <path refid="jboss.core.classpath"/>
</path>
</target>
18 years, 2 months
- 1
- 0
JBossWS SVN: r1730 - in trunk/integration-jboss50: . src src/main src/main/resources
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 07:55:19 -0500 (Fri, 22 Dec 2006)
New Revision: 1730
Added:
trunk/integration-jboss50/src/main/resources/
trunk/integration-jboss50/src/main/resources/jbossws-jboss50-integration.jar/
trunk/integration-jboss50/src/main/resources/jbossws.deployer/
Removed:
trunk/integration-jboss50/src/main/resources/jbossws.deployer/
trunk/integration-jboss50/src/resources/
Modified:
trunk/integration-jboss50/build.xml
Log:
restructure build
Modified: trunk/integration-jboss50/build.xml
===================================================================
--- trunk/integration-jboss50/build.xml 2006-12-22 12:55:13 UTC (rev 1729)
+++ trunk/integration-jboss50/build.xml 2006-12-22 12:55:19 UTC (rev 1730)
@@ -80,7 +80,7 @@
<include name="org/jboss/ws/integration/*.class"/>
<include name="org/jboss/ws/integration/jboss50/**"/>
</fileset>
- <!--metainf dir="${jboss50.resources.dir}/jbossws-jboss50-integration.jar/META-INF"/-->
+ <metainf dir="${jboss50.resources.dir}/jbossws-jboss50-integration.jar/META-INF"/>
</jar>
<!-- Build jbossws-context.war -->
Copied: trunk/integration-jboss50/src/main/resources (from rev 1718, trunk/integration-jboss50/src/resources)
Copied: trunk/integration-jboss50/src/main/resources/jbossws-jboss50-integration.jar (from rev 1728, trunk/integration-jboss50/src/resources/jbossws-jboss50-integration.jar)
Copied: trunk/integration-jboss50/src/main/resources/jbossws.deployer (from rev 1728, trunk/integration-jboss50/src/resources/jbossws.deployer)
18 years, 2 months
- 1
- 0
JBossWS SVN: r1729 - in trunk/integration-jboss42/src: . main main/resources
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 07:55:13 -0500 (Fri, 22 Dec 2006)
New Revision: 1729
Added:
trunk/integration-jboss42/src/main/resources/
trunk/integration-jboss42/src/main/resources/jbossws-jboss42-integration.jar/
trunk/integration-jboss42/src/main/resources/jbossws.beans/
trunk/integration-jboss42/src/main/resources/jbossws.sar/
Removed:
trunk/integration-jboss42/src/main/resources/jbossws.beans/
trunk/integration-jboss42/src/main/resources/jbossws.sar/
trunk/integration-jboss42/src/resources/
Log:
restructure build
Copied: trunk/integration-jboss42/src/main/resources (from rev 1718, trunk/integration-jboss42/src/resources)
Copied: trunk/integration-jboss42/src/main/resources/jbossws-jboss42-integration.jar (from rev 1728, trunk/integration-jboss42/src/resources/jbossws-jboss42-integration.jar)
Copied: trunk/integration-jboss42/src/main/resources/jbossws.beans (from rev 1728, trunk/integration-jboss42/src/resources/jbossws.beans)
Copied: trunk/integration-jboss42/src/main/resources/jbossws.sar (from rev 1728, trunk/integration-jboss42/src/resources/jbossws.sar)
18 years, 2 months
- 1
- 0
JBossWS SVN: r1728 - trunk/build
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 07:54:30 -0500 (Fri, 22 Dec 2006)
New Revision: 1728
Modified:
trunk/build/build.xml
Log:
restructure build
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2006-12-22 12:49:52 UTC (rev 1727)
+++ trunk/build/build.xml 2006-12-22 12:54:30 UTC (rev 1728)
@@ -43,7 +43,7 @@
</target>
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${output.dir}"/>
+ <delete dir="${build.dir}/output"/>
<ant antfile="${jbossws.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${integration.jboss42.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${integration.jboss50.dir}/build.xml" target="clean" inheritall="false"/>
18 years, 2 months
- 1
- 0
JBossWS SVN: r1727 - in trunk/integration-jboss50: . src/main/java/org/jboss/ws/integration/jboss50 src/resources src/resources/jbossws-jboss50-integration.jar src/resources/jbossws-jboss50-integration.jar/META-INF src/resources/jbossws-jboss50-integration.jar/META-INF/services
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 07:49:52 -0500 (Fri, 22 Dec 2006)
New Revision: 1727
Added:
trunk/integration-jboss50/build.xml
trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAssociationAdaptorFactoryImpl.java
trunk/integration-jboss50/src/resources/jbossws-jboss50-integration.jar/
trunk/integration-jboss50/src/resources/jbossws-jboss50-integration.jar/META-INF/
trunk/integration-jboss50/src/resources/jbossws-jboss50-integration.jar/META-INF/services/
trunk/integration-jboss50/src/resources/jbossws-jboss50-integration.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
Removed:
trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAdaptorFactoryImpl.java
Modified:
trunk/integration-jboss50/
Log:
restructure build
Property changes on: trunk/integration-jboss50
___________________________________________________________________
Name: svn:ignore
-
output-eclipse
+
output-eclipse
output
Added: trunk/integration-jboss50/build.xml
===================================================================
--- trunk/integration-jboss50/build.xml 2006-12-22 12:49:45 UTC (rev 1726)
+++ trunk/integration-jboss50/build.xml 2006-12-22 12:49:52 UTC (rev 1727)
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="../integration-jboss50" name="JBossWS-JBoss50">
+
+ <import file="${basedir}/../build/import/build-setup.xml"/>
+ <import file="${basedir}/../build/import/build-thirdparty.xml"/>
+ <import file="${basedir}/../jbossws/build.xml"/>
+
+ <property name="jboss50.src.dir" value="${integration.jboss50.dir}/src/main"/>
+ <property name="jboss50.java.dir" value="${jboss50.src.dir}/java"/>
+ <property name="jboss50.resources.dir" value="${jboss50.src.dir}/resources"/>
+ <property name="jboss50.output.dir" value="${integration.jboss50.dir}/output"/>
+ <property name="jboss50.output.classes.dir" value="${jboss50.output.dir}/classes"/>
+ <property name="jboss50.output.classes14.dir" value="${jboss50.output.dir}/classes14"/>
+ <property name="jboss50.output.lib.dir" value="${jboss50.output.dir}/lib"/>
+
+ <target name="jboss50-init" depends="prepare, thirdparty">
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+
+ <target name="jboss50-compile" depends="jboss50-init,jboss50-compile-classes,jboss50-compile-etc" description="Compile all source files."/>
+
+ <!-- Compile java sources -->
+ <target name="jboss50-compile-classes" depends="jboss50-init,jbossws-compile">
+ <mkdir dir="${jboss50.output.classes.dir}"/>
+ <javac srcdir="${jboss50.java.dir}" sourcepath="" destdir="${jboss50.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <include name="org/jboss/ws/integration/jboss50/**"/>
+ <classpath refid="jboss50.integration.classpath"/>
+ <classpath path="${jbossws.output.classes14.dir}"/>
+ <classpath path="${jbossws.output.classes.dir}"/>
+ </javac>
+ </target>
+
+ <!-- Compile etc files (manifests and such) -->
+ <target name="jboss50-compile-etc" depends="jboss50-init">
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="jboss50-jars" depends="jboss50-compile,jboss50-module-jars" description="Builds all jar files.">
+ </target>
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="jboss50-module-jars" depends="jbossws-jars">
+
+ <!-- Build jbossws-jboss50-integration.jar -->
+ <mkdir dir="${jboss50.output.lib.dir}"/>
+ <jar jarfile="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${jboss50.output.classes.dir}">
+ <include name="org/jboss/ws/integration/*.class"/>
+ <include name="org/jboss/ws/integration/jboss50/**"/>
+ </fileset>
+ <!--metainf dir="${jboss50.resources.dir}/jbossws-jboss50-integration.jar/META-INF"/-->
+ </jar>
+
+ <!-- Build jbossws-context.war -->
+ <war warfile="${jboss50.output.lib.dir}/jbossws-context.war" webxml="${jbossws.resources.dir}/jbossws.war/JBoss/WEB-INF/web.xml">
+ <fileset dir="${jbossws.resources.dir}/jbossws.war">
+ <include name="index.html"/>
+ <include name="styles.css"/>
+ </fileset>
+ <webinf dir="${jbossws.resources.dir}/jbossws.war/JBoss/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
+ <!-- Build jbossws50.sar -->
+ <jar jarfile="${jboss50.output.lib.dir}/jbossws50.sar" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${jboss50.output.lib.dir}">
+ <include name="jbossws-context.war"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="policy-1.0.jar"/>
+ <include name="sjsxp.jar"/>
+ <include name="stax-api-1.0.jar"/>
+ <include name="wstx-lgpl-2.9.3.jar"/>
+ <include name="xmlsec.jar"/>
+ </fileset>
+ <metainf dir="${jbossws.resources.dir}/jbossws.sar/META-INF">
+ <include name="standard-jaxrpc-client-config.xml"/>
+ <include name="standard-jaxrpc-endpoint-config.xml"/>
+ <include name="standard-jaxws-client-config.xml"/>
+ <include name="standard-jaxws-endpoint-config.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- Build jbossws50.deployer -->
+ <jar jarfile="${jboss50.output.lib.dir}/jbossws50.deployer" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${jboss50.output.lib.dir}">
+ <include name="jbossws-jboss50-integration.jar"/>
+ <include name="jbossws-core.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ <metainf dir="${jboss50.resources.dir}/jbossws.deployer/META-INF">
+ <include name="jbossws-deployer-beans.xml"/>
+ </metainf>
+ </jar>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws to the jboss50 -->
+ <target name="deploy-jboss50" depends="jboss50-jars" description="Deploy jbossws">
+ <copy todir="${jboss50.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
+ <copy todir="${jboss50.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
+ <copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="${jbossws.output.lib.dir}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="${jbossws.output.lib.dir}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jboss50.output.lib.dir}/jbossws50.deployer"/>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${jboss50.output.dir}"/>
+ </target>
+
+ <target name="main" description="Executes the default target (most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything." depends="jboss50-jars"/>
+
+ <target name="all" description="Create a distribution zip file" depends="main">
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: trunk/integration-jboss50/build.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAdaptorFactoryImpl.java
===================================================================
--- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAdaptorFactoryImpl.java 2006-12-22 12:49:45 UTC (rev 1726)
+++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAdaptorFactoryImpl.java 2006-12-22 12:49:52 UTC (rev 1727)
@@ -1,57 +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.integration.jboss50;
-
-// $Id$
-
-import java.security.Principal;
-
-import org.jboss.security.SecurityAssociation;
-import org.jboss.ws.extensions.security.SecurityAdaptor;
-import org.jboss.ws.extensions.security.SecurityAdaptorFactory;
-
-/**
- * A Jboss specific SecurityAdaptorFactory
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class SecurityAdaptorFactoryImpl extends SecurityAdaptorFactory
-{
- public SecurityAdaptor getSecurityAdaptor()
- {
- return new SecurityAdaptorImpl();
- }
-
- public class SecurityAdaptorImpl implements SecurityAdaptor
- {
- public void setPrincipal(Principal pricipal)
- {
- SecurityAssociation.setPrincipal(pricipal);
- }
-
- public void setCredential(Object credential)
- {
- SecurityAssociation.setCredential(credential);
- }
- }
-}
Copied: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAssociationAdaptorFactoryImpl.java (from rev 1718, trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAdaptorFactoryImpl.java)
===================================================================
--- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAdaptorFactoryImpl.java 2006-12-22 01:32:40 UTC (rev 1718)
+++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAssociationAdaptorFactoryImpl.java 2006-12-22 12:49:52 UTC (rev 1727)
@@ -0,0 +1,57 @@
+/*
+ * 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.jboss50;
+
+// $Id$
+
+import java.security.Principal;
+
+import org.jboss.security.SecurityAssociation;
+import org.jboss.ws.extensions.security.SecurityAssociationAdaptor;
+import org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory;
+
+/**
+ * A JBoss specific SecurityAdaptorFactory
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public class SecurityAssociationAdaptorFactoryImpl implements SecurityAssociationAdaptorFactory
+{
+ public SecurityAssociationAdaptor getSecurityAssociationAdaptor()
+ {
+ return new SecurityAccociationAdaptorImpl();
+ }
+
+ public class SecurityAccociationAdaptorImpl implements SecurityAssociationAdaptor
+ {
+ public void setPrincipal(Principal pricipal)
+ {
+ SecurityAssociation.setPrincipal(pricipal);
+ }
+
+ public void setCredential(Object credential)
+ {
+ SecurityAssociation.setCredential(credential);
+ }
+ }
+}
Added: trunk/integration-jboss50/src/resources/jbossws-jboss50-integration.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
===================================================================
--- trunk/integration-jboss50/src/resources/jbossws-jboss50-integration.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2006-12-22 12:49:45 UTC (rev 1726)
+++ trunk/integration-jboss50/src/resources/jbossws-jboss50-integration.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2006-12-22 12:49:52 UTC (rev 1727)
@@ -0,0 +1 @@
+org.jboss.ws.integration.jboss50.SecurityAssociationAdaptorFactoryImpl
\ No newline at end of file
18 years, 2 months
- 1
- 0
JBossWS SVN: r1726 - in trunk/jbossws: . src/main/java/org/jboss/ws src/main/java/org/jboss/ws/extensions/security
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 07:49:45 -0500 (Fri, 22 Dec 2006)
New Revision: 1726
Added:
trunk/jbossws/build.xml
trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptor.java
trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptorFactory.java
Removed:
trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAdaptor.java
trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAdaptorFactory.java
trunk/jbossws/src/main/java/org/jboss/ws/integration/
Modified:
trunk/jbossws/
trunk/jbossws/.classpath
trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
Log:
restructure build
Property changes on: trunk/jbossws
___________________________________________________________________
Name: svn:ignore
-
output-eclipse
+
output-eclipse
output
Modified: trunk/jbossws/.classpath
===================================================================
--- trunk/jbossws/.classpath 2006-12-22 12:49:37 UTC (rev 1725)
+++ trunk/jbossws/.classpath 2006-12-22 12:49:45 UTC (rev 1726)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
<classpathentry combineaccessrules="false" kind="src" path="/build"/>
Added: trunk/jbossws/build.xml
===================================================================
--- trunk/jbossws/build.xml 2006-12-22 12:49:37 UTC (rev 1725)
+++ trunk/jbossws/build.xml 2006-12-22 12:49:45 UTC (rev 1726)
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="../jbossws" name="JBossWS-Main">
+
+ <import file="${basedir}/../build/import/build-samples.xml"/>
+ <import file="${basedir}/../build/import/build-setup.xml"/>
+ <import file="${basedir}/../build/import/build-thirdparty.xml"/>
+
+ <property name="jbossws.src.dir" value="${jbossws.dir}/src/main"/>
+ <property name="jbossws.java.dir" value="${jbossws.src.dir}/java"/>
+ <property name="jbossws.resources.dir" value="${jbossws.src.dir}/resources"/>
+ <property name="jbossws.output.dir" value="${jbossws.dir}/output"/>
+ <property name="jbossws.output.classes.dir" value="${jbossws.output.dir}/classes"/>
+ <property name="jbossws.output.classes14.dir" value="${jbossws.output.dir}/classes14"/>
+ <property name="jbossws.output.lib.dir" value="${jbossws.output.dir}/lib"/>
+
+ <property name="test.dir" value="${basedir}/src/test"/>
+ <property name="test.etc.dir" value="${test.dir}/etc"/>
+ <property name="test.jbossws.java.dir" value="${test.dir}/java"/>
+ <property name="test.jbossws.resources.dir" value="${test.dir}/resources"/>
+
+ <target name="jbossws-init" depends="prepare, thirdparty">
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+
+ <target name="jbossws-compile" depends="jbossws-init,jbossws-compile-classes,jbossws-compile-etc" description="Compile all source files."/>
+
+ <!-- Compile java sources -->
+ <target name="jbossws-compile-classes" depends="jbossws-compile-interfaces,jbossws-compile-core"/>
+
+ <!-- Compile core java sources -->
+ <target name="jbossws-compile-interfaces" depends="jbossws-init">
+ <mkdir dir="${jbossws.output.classes14.dir}"/>
+ <javac srcdir="${jbossws.java.dir}" destdir="${jbossws.output.classes14.dir}" encoding="utf-8" 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/**"/>
+ <classpath refid="jboss.core.classpath"/>
+ <classpath refid="library.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Compile core java sources -->
+ <target name="jbossws-compile-core" depends="jbossws-compile-interfaces">
+ <mkdir dir="${jbossws.output.classes.dir}"/>
+ <javac srcdir="${jbossws.java.dir}" sourcepath="" destdir="${jbossws.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <include name="javax/xml/ws/**"/>
+ <include name="javax/jws/**"/>
+ <include name="org/jboss/ws/**"/>
+ <exclude name="org/jboss/ws/integration/**"/>
+ <classpath path="${jbossws.output.classes14.dir}"/>
+ <classpath refid="jboss.core.classpath"/>
+ <classpath refid="library.classpath"/>
+ </javac>
+ </target>
+
+
+ <!-- Compile etc files (manifests and such) -->
+ <target name="jbossws-compile-etc" depends="jbossws-init">
+ <mkdir dir="${output.etc.dir}"/>
+ <copy todir="${output.etc.dir}" filtering="yes" overwrite="yes">
+ <fileset dir="${build.dir}/etc"/>
+ <filterset>
+ <filter token="java.vm.version" value="${java.vm.version}"/>
+ <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
+ <filter token="build.id" value="${output.id}"/>
+ <filter token="implementation.version" value="jbossws-${version.id}"/>
+ <filtersfile file="${basedir}/../build/version.properties"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="jbossws-jars" depends="jbossws-compile,jbossws-module-jars" description="Builds all jar files.">
+ </target>
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="jbossws-module-jars">
+
+ <!-- Build jboss-jaxrpc.jar -->
+ <mkdir dir="${jbossws.output.lib.dir}"/>
+ <jar jarfile="${jbossws.output.lib.dir}/jboss-jaxrpc.jar" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${jbossws.output.classes14.dir}">
+ <include name="javax/xml/rpc/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-saaj.jar -->
+ <mkdir dir="${jbossws.output.lib.dir}"/>
+ <jar jarfile="${jbossws.output.lib.dir}/jboss-saaj.jar" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${jbossws.output.classes14.dir}">
+ <include name="javax/xml/soap/**"/>
+ </fileset>
+ <metainf dir="${jbossws.resources.dir}/jboss-saaj.jar/META-INF"/>
+ </jar>
+
+ <!-- Build jboss-jaxws.jar -->
+ <mkdir dir="${jbossws.output.lib.dir}"/>
+ <jar jarfile="${jbossws.output.lib.dir}/jboss-jaxws.jar" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${jbossws.output.classes.dir}">
+ <include name="javax/jws/**"/>
+ <include name="javax/xml/ws/**"/>
+ <include name="org/jboss/ws/jaxws/injection/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jbossws-core.jar -->
+ <mkdir dir="${jbossws.output.lib.dir}"/>
+ <jar jarfile="${jbossws.output.lib.dir}/jbossws-core.jar" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${jbossws.output.classes.dir}">
+ <include name="org/jboss/ws/**"/>
+ <exclude name="org/jboss/ws/integration/**"/>
+ </fileset>
+ <fileset dir="${jbossws.resources.dir}">
+ <include name="schema/**"/>
+ <include name="dtd/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jbossws-client.jar -->
+ <jar jarfile="${jbossws.output.lib.dir}/jbossws-client.jar" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${jbossws.output.classes14.dir}">
+ <include name="javax/xml/rpc/**"/>
+ <include name="javax/xml/soap/**"/>
+ </fileset>
+ <fileset dir="${jbossws.output.classes.dir}">
+ <include name="javax/xml/ws/**"/>
+ <include name="javax/jws/**"/>
+ <include name="org/jboss/ws/**"/>
+ <exclude name="org/jboss/ws/integration/jboss50/**"/>
+ <exclude name="org/jboss/ws/integration/tomcat/**"/>
+ </fileset>
+ <fileset dir="${jbossws.resources.dir}/jbossws.sar">
+ <include name="META-INF/standard-jaxrpc-client-config.xml"/>
+ <include name="META-INF/standard-jaxws-client-config.xml"/>
+ </fileset>
+ <fileset dir="${jbossws.resources.dir}">
+ <include name="schema/**"/>
+ <include name="dtd/**"/>
+ </fileset>
+ <fileset dir="${output.etc.dir}">
+ <include name="wstools.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools-log4j.xml"/>
+ </fileset>
+ <metainf dir="${jbossws.resources.dir}/jboss-saaj.jar/META-INF"/>
+ </jar>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Documentation -->
+ <!-- ================================================================== -->
+
+ <!-- Generate the JavaDoc -->
+ <target name="jbossws-javadoc" depends="jbossws-init" description="Generate the Javadoc">
+
+ <mkdir dir="${output.api-docs}"/>
+ <javadoc destdir="${output.api-docs}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <packageset dir="${jbossws.java.dir}" defaultexcludes="yes">
+ <include name="org/jboss/ws/**"/>
+ </packageset>
+ <packageset dir="${jboss.server.root}/../src/main" defaultexcludes="yes">
+ <include name="org/jboss/webservice/metadata/**"/>
+ </packageset>
+
+ <doctitle><![CDATA[<h1>JBossWS</h1>]]></doctitle>
+ <tag name="todo" scope="all" description="To do:"/>
+ <group title="Core" packages="org.jboss.ws.core*"/>
+ <group title="Metadata" packages="org.jboss.ws.metadata*"/>
+ <group title="Integration" packages="org.jboss.ws.integration*"/>
+ <group title="Extensions" packages="org.jboss.ws.extensions*"/>
+ <group title="Tools" packages="org.jboss.ws.tools*"/>
+ </javadoc>
+ </target>
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${jbossws.output.dir}"/>
+ </target>
+
+ <target name="main" description="Executes the default target (most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything." depends="jbossws-jars"/>
+
+ <target name="all" description="Create a distribution zip file" depends="main">
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: trunk/jbossws/build.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
===================================================================
--- trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2006-12-22 12:49:37 UTC (rev 1725)
+++ trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2006-12-22 12:49:45 UTC (rev 1726)
@@ -21,6 +21,10 @@
*/
package org.jboss.ws.extensions.security;
+// $Id$
+
+import javax.xml.soap.FactoryLoader;
+
import org.jboss.ws.extensions.security.element.SecurityHeader;
import org.jboss.ws.extensions.security.element.Token;
import org.jboss.ws.extensions.security.element.UsernameToken;
@@ -29,7 +33,6 @@
public class ReceiveUsernameOperation implements TokenOperation
{
private SecurityHeader header;
-
private SecurityStore store;
public ReceiveUsernameOperation(SecurityHeader header, SecurityStore store)
@@ -41,9 +44,9 @@
public void process(Document message, Token token) throws WSSecurityException
{
UsernameToken user = (UsernameToken)token;
-
- SecurityAdaptorFactory factory = SecurityAdaptorFactory.getInstance();
- SecurityAdaptor securityAdaptor = factory.getSecurityAdaptor();
+ String propName = SecurityAssociationAdaptorFactory.class.getName();
+ SecurityAssociationAdaptorFactory factory = (SecurityAssociationAdaptorFactory)FactoryLoader.loadFactory(propName, null);
+ SecurityAssociationAdaptor securityAdaptor = factory.getSecurityAssociationAdaptor();
securityAdaptor.setPrincipal(new SimplePrincipal(user.getUsername()));
securityAdaptor.setCredential(user.getPassword());
}
Deleted: trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAdaptor.java
===================================================================
--- trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAdaptor.java 2006-12-22 12:49:37 UTC (rev 1725)
+++ trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAdaptor.java 2006-12-22 12:49:45 UTC (rev 1726)
@@ -1,38 +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.extensions.security;
-
-// $Id$
-
-import java.security.Principal;
-
-/**
- * A container idependent security adaptor
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2005
- */
-public interface SecurityAdaptor
-{
- void setPrincipal(Principal pricipal);
- void setCredential(Object credential);
-}
Deleted: trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAdaptorFactory.java
===================================================================
--- trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAdaptorFactory.java 2006-12-22 12:49:37 UTC (rev 1725)
+++ trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAdaptorFactory.java 2006-12-22 12:49:45 UTC (rev 1726)
@@ -1,70 +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.extensions.security;
-
-//$Id$
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-
-/**
- * A container idependent security adaptor factory
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2005
- */
-public class SecurityAdaptorFactory
-{
- // provide logging
- private static final Logger log = Logger.getLogger(SecurityAdaptorFactory.class);
-
- public static final String DEFAULT_FACTORY = "org.jboss.ws.integration.SecurityAdaptorFactoryImpl";
-
- private static SecurityAdaptorFactory delegate;
-
- public static SecurityAdaptorFactory getInstance()
- {
- if (delegate == null)
- {
- ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
- try
- {
- Class factoryClass = ctxLoader.loadClass(DEFAULT_FACTORY);
- delegate = (SecurityAdaptorFactory)factoryClass.newInstance();
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception e)
- {
- throw new WSException("Cannot load: " + DEFAULT_FACTORY, e);
- }
- }
- return delegate;
- }
-
- public SecurityAdaptor getSecurityAdaptor()
- {
- return delegate.getSecurityAdaptor();
- }
-}
Copied: trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptor.java (from rev 1718, trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAdaptor.java)
===================================================================
--- trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAdaptor.java 2006-12-22 01:32:40 UTC (rev 1718)
+++ trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptor.java 2006-12-22 12:49:45 UTC (rev 1726)
@@ -0,0 +1,38 @@
+/*
+* 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.extensions.security;
+
+// $Id$
+
+import java.security.Principal;
+
+/**
+ * A container idependent security adaptor
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2005
+ */
+public interface SecurityAssociationAdaptor
+{
+ void setPrincipal(Principal pricipal);
+ void setCredential(Object credential);
+}
Added: trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptorFactory.java
===================================================================
--- trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptorFactory.java 2006-12-22 12:49:37 UTC (rev 1725)
+++ trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptorFactory.java 2006-12-22 12:49:45 UTC (rev 1726)
@@ -0,0 +1,36 @@
+/*
+* 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.extensions.security;
+
+// $Id$
+
+
+/**
+ * A container idependent security adaptor factory
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2005
+ */
+public interface SecurityAssociationAdaptorFactory
+{
+ SecurityAssociationAdaptor getSecurityAssociationAdaptor();
+}
Property changes on: trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptorFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 2 months
- 1
- 0
JBossWS SVN: r1725 - in trunk/integration-jboss42: . src/main/java/org/jboss/ws/integration/jboss42 src/resources src/resources/jbossws-jboss42-integration.jar src/resources/jbossws-jboss42-integration.jar/META-INF src/resources/jbossws-jboss42-integration.jar/META-INF/services
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 07:49:37 -0500 (Fri, 22 Dec 2006)
New Revision: 1725
Added:
trunk/integration-jboss42/build.xml
trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/SecurityAssociationAdaptorFactoryImpl.java
trunk/integration-jboss42/src/resources/jbossws-jboss42-integration.jar/
trunk/integration-jboss42/src/resources/jbossws-jboss42-integration.jar/META-INF/
trunk/integration-jboss42/src/resources/jbossws-jboss42-integration.jar/META-INF/services/
trunk/integration-jboss42/src/resources/jbossws-jboss42-integration.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
Modified:
trunk/integration-jboss42/
Log:
restructure build
Property changes on: trunk/integration-jboss42
___________________________________________________________________
Name: svn:ignore
-
output-eclipse
+
output-eclipse
output
Added: trunk/integration-jboss42/build.xml
===================================================================
--- trunk/integration-jboss42/build.xml 2006-12-22 12:49:33 UTC (rev 1724)
+++ trunk/integration-jboss42/build.xml 2006-12-22 12:49:37 UTC (rev 1725)
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="../integration-jboss42" name="JBossWS-JBoss42">
+
+ <import file="${basedir}/../build/import/build-setup.xml"/>
+ <import file="${basedir}/../build/import/build-thirdparty.xml"/>
+
+ <target name="jboss42-init" depends="prepare, thirdparty">
+ <path id="core.classpath">
+ <path refid="library.classpath"/>
+ <path refid="jboss.core.classpath"/>
+ <path path="${jbossws.dir}/output/lib/jbossws-client.jar"/>
+ </path>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+
+ <target name="jboss42-compile" depends="jboss42-compile-classes,jboss42-compile-etc" description="Compile all source files."/>
+
+ <!-- Compile integration java sources -->
+ <target name="jboss42-compile-classes" depends="jboss42-init">
+ <mkdir dir="${output.classes.dir}"/>
+ <ant antfile="${jbossws.dir}/build.xml" target="jbossws-jars" dir="${jbossws.dir}" inheritall="false"/>
+ <javac srcdir="${integration.jboss42.dir}/src/main/java" sourcepath="" destdir="${output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <include name="org/jboss/ws/integration/jboss42/**"/>
+ <classpath path="${output.classes14.dir}"/>
+ <classpath refid="jboss42.integration.classpath"/>
+ <classpath refid="core.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Compile etc files (manifests and such) -->
+ <target name="jboss42-compile-etc" depends="jboss42-init">
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="jboss42-jars" depends="jboss42-compile,jboss42-module-jars" description="Builds all jar files.">
+ </target>
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="jboss42-module-jars">
+
+ <!-- Build jbossws-jboss42-integration.jar -->
+ <mkdir dir="${output.lib.dir}"/>
+ <jar jarfile="${output.lib.dir}/jbossws-jboss42-integration.jar" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${output.classes.dir}">
+ <include name="org/jboss/ws/integration/*.class"/>
+ <include name="org/jboss/ws/integration/jboss42/**"/>
+ </fileset>
+ <metainf dir="${integration.jboss42.dir}/src/resources/jbossws-jboss42-integration.jar/META-INF"/>
+ </jar>
+
+ <!-- Build jbossws42.sar -->
+ <jar jarfile="${output.lib.dir}/jbossws42.sar" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${output.lib.dir}">
+ <include name="jbossws-jboss42-integration.jar"/>
+ <include name="jbossws-core.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jbossws-context.war"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="policy-1.0.jar"/>
+ <include name="sjsxp.jar"/>
+ <include name="stax-api-1.0.jar"/>
+ <include name="wstx-lgpl-2.9.3.jar"/>
+ <include name="xmlsec.jar"/>
+ </fileset>
+ <fileset dir="${integration.jboss42.dir}/src/resources">
+ <include name="jbossws.beans/META-INF/jboss-beans.xml"/>
+ </fileset>
+ <metainf dir="${jbossws.resources.dir}/jbossws.sar/META-INF">
+ <include name="standard-jaxrpc-client-config.xml"/>
+ <include name="standard-jaxrpc-endpoint-config.xml"/>
+ <include name="standard-jaxws-client-config.xml"/>
+ <include name="standard-jaxws-endpoint-config.xml"/>
+ </metainf>
+ <metainf dir="${integration.jboss42.dir}/src/resources/jbossws.sar/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ </jar>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws to the jboss42 -->
+ <target name="deploy-jboss42" depends="jboss42-jars" description="Deploy jbossws">
+ <copy todir="${jboss42.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
+ <copy todir="${jboss42.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
+ <copy todir="${jboss42.home}/client" overwrite="true">
+ <fileset dir="${output.lib.dir}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="${output.lib.dir}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${output.lib.dir}/jbossws42.sar"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="main" description="Executes the default target (most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything." depends="jboss42-jars"/>
+
+ <target name="all" description="Create a distribution zip file" depends="main">
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: trunk/integration-jboss42/build.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/SecurityAssociationAdaptorFactoryImpl.java
===================================================================
--- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/SecurityAssociationAdaptorFactoryImpl.java 2006-12-22 12:49:33 UTC (rev 1724)
+++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/SecurityAssociationAdaptorFactoryImpl.java 2006-12-22 12:49:37 UTC (rev 1725)
@@ -0,0 +1,57 @@
+/*
+ * 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.jboss42;
+
+// $Id$
+
+import java.security.Principal;
+
+import org.jboss.security.SecurityAssociation;
+import org.jboss.ws.extensions.security.SecurityAssociationAdaptor;
+import org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory;
+
+/**
+ * A JBoss specific SecurityAdaptorFactory
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public class SecurityAssociationAdaptorFactoryImpl implements SecurityAssociationAdaptorFactory
+{
+ public SecurityAssociationAdaptor getSecurityAssociationAdaptor()
+ {
+ return new SecurityAccociationAdaptorImpl();
+ }
+
+ public class SecurityAccociationAdaptorImpl implements SecurityAssociationAdaptor
+ {
+ public void setPrincipal(Principal pricipal)
+ {
+ SecurityAssociation.setPrincipal(pricipal);
+ }
+
+ public void setCredential(Object credential)
+ {
+ SecurityAssociation.setCredential(credential);
+ }
+ }
+}
Property changes on: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/SecurityAssociationAdaptorFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration-jboss42/src/resources/jbossws-jboss42-integration.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
===================================================================
--- trunk/integration-jboss42/src/resources/jbossws-jboss42-integration.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2006-12-22 12:49:33 UTC (rev 1724)
+++ trunk/integration-jboss42/src/resources/jbossws-jboss42-integration.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2006-12-22 12:49:37 UTC (rev 1725)
@@ -0,0 +1 @@
+org.jboss.ws.integration.jboss42.SecurityAssociationAdaptorFactoryImpl
\ No newline at end of file
18 years, 2 months
- 1
- 0
JBossWS SVN: r1724 - trunk/integration-tomcat
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 07:49:33 -0500 (Fri, 22 Dec 2006)
New Revision: 1724
Added:
trunk/integration-tomcat/build.xml
Modified:
trunk/integration-tomcat/
Log:
restructure build
Property changes on: trunk/integration-tomcat
___________________________________________________________________
Name: svn:ignore
-
output-eclipse
+
output-eclipse
output
Added: trunk/integration-tomcat/build.xml
===================================================================
--- trunk/integration-tomcat/build.xml 2006-12-22 12:49:28 UTC (rev 1723)
+++ trunk/integration-tomcat/build.xml 2006-12-22 12:49:33 UTC (rev 1724)
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="../integration-tomcat" name="JBossWS-Tomcat">
+
+ <import file="${basedir}/../build/import/build-setup.xml"/>
+ <import file="${basedir}/../build/import/build-thirdparty.xml"/>
+
+ <target name="tomcat-init" depends="prepare, thirdparty">
+ <path id="core.classpath">
+ <path refid="library.classpath"/>
+ <path refid="jboss.core.classpath"/>
+ <path path="${jbossws.dir}/output/lib/jbossws-client.jar"/>
+ </path>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+
+ <target name="tomcat-compile" depends="tomcat-init,tomcat-compile-classes,tomcat-compile-etc" description="Compile all source files."/>
+
+ <!-- Compile java sources -->
+ <target name="tomcat-compile-classes" depends="tomcat-init">
+ <mkdir dir="${output.classes.dir}"/>
+ <ant antfile="${jbossws.dir}/build.xml" target="jbossws-jars" dir="${jbossws.dir}" inheritall="false"/>
+ <javac srcdir="${integration.tomcat.dir}/src/main/java" sourcepath="" destdir="${output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <include name="org/jboss/ws/integration/tomcat/**"/>
+ <classpath path="${output.classes14.dir}"/>
+ <classpath refid="tomcat.integration.classpath"/>
+ <classpath refid="core.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Compile etc files (manifests and such) -->
+ <target name="tomcat-compile-etc" depends="tomcat-init">
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="tomcat-jars" depends="tomcat-compile,tomcat-module-jars" description="Builds all jar files.">
+ </target>
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="tomcat-module-jars">
+
+ <!-- Build jbossws-tomcat-integration.jar -->
+ <mkdir dir="${output.lib.dir}"/>
+ <jar jarfile="${output.lib.dir}/jbossws-tomcat-integration.jar" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${output.classes.dir}">
+ <include name="org/jboss/ws/integration/tomcat/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jbossws.war -->
+ <war warfile="${output.lib.dir}/jbossws.war" webxml="${jbossws.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml">
+ <fileset dir="${jbossws.resources.dir}/jbossws.war">
+ <include name="index.html"/>
+ <include name="styles.css"/>
+ </fileset>
+ <fileset dir="${jbossws.resources.dir}/jbossws.war/Tomcat">
+ <include name="META-INF/jboss-beans.xml"/>
+ </fileset>
+ <fileset dir="${jbossws.resources.dir}/jbossws.sar">
+ <include name="META-INF/standard-jaxrpc-client-config.xml"/>
+ <include name="META-INF/standard-jaxrpc-endpoint-config.xml"/>
+ <include name="META-INF/standard-jaxws-client-config.xml"/>
+ <include name="META-INF/standard-jaxws-endpoint-config.xml"/>
+ </fileset>
+ <classes dir="${jbossws.resources.dir}/jbossws.war/Tomcat/WEB-INF">
+ <include name="log4j.xml"/>
+ </classes>
+ </war>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy to Tomcat -->
+ <target name="deploy-tomcat" depends="tomcat-jars,tomcat-thirdparty-jar" description="Deploy JBossWS to Tomcat">
+ <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
+ <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/>
+ <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mailapi.jar"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jbossws-core.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jboss-jaxws.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jboss-saaj.jar" overwrite="true"/>
+ <copy todir="${tomcat.webapps.dir}" file="${output.lib.dir}/jbossws.war" overwrite="true"/>
+ <delete dir="${tomcat.webapps.dir}/jbossws"/>
+ </target>
+
+ <target name="tomcat-thirdparty-jar" unless="jbossws.thirdparty.available">
+ <!-- Build jbossws-thirdparty.jar -->
+ <mkdir dir="${output.lib.dir}/build"/>
+ <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/>
+ <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-common-core.jar"/>
+ <unjar dest="${output.lib.dir}/build" src="${jboss.server.lib}/jboss-j2ee.jar"/>
+ <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/>
+ <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/>
+ <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-logging-spi.jar"/>
+ <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-microcontainer.jar"/>
+ <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-remoting.jar"/>
+ <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/jboss-xml-binding.jar"/>
+ <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/javassist.jar"/>
+ <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/>
+ <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/>
+ <unjar dest="${output.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/>
+ <jar jarfile="${output.lib.dir}/jbossws-thirdparty.jar" manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${output.lib.dir}/build"/>
+ </jar>
+ <delete dir="${output.lib.dir}/build"/>
+ </target>
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="main" description="Executes the default target (most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything." depends="tomcat-jars"/>
+
+ <target name="all" description="Create a distribution zip file" depends="main">
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: trunk/integration-tomcat/build.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 2 months
- 1
- 0
JBossWS SVN: r1723 - in trunk/build: . import
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 07:49:28 -0500 (Fri, 22 Dec 2006)
New Revision: 1723
Added:
trunk/build/import/build-setup.xml
Modified:
trunk/build/build.xml
trunk/build/import/build-release.xml
trunk/build/import/build-thirdparty.xml
Log:
restructure build
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2006-12-22 08:47:42 UTC (rev 1722)
+++ trunk/build/build.xml 2006-12-22 12:49:28 UTC (rev 1723)
@@ -11,536 +11,45 @@
<!-- $Id$ -->
-<project default="main" name="JBossWS">
+<project default="main" basedir="../build" name="JBossWS-Build">
<import file="${basedir}/import/build-thirdparty.xml"/>
- <import file="${basedir}/import/build-samples.xml"/>
+ <import file="${basedir}/import/build-setup.xml"/>
<import file="${basedir}/import/build-release.xml"/>
+ <import file="${basedir}/../integration-jboss42/build.xml"/>
+ <import file="${basedir}/../integration-jboss50/build.xml"/>
+ <import file="${basedir}/../integration-tomcat/build.xml"/>
+ <import file="${basedir}/../jbossws/build.xml"/>
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property file="ant.properties"/>
- <property file="version.properties"/>
-
- <property environment="env"/>
- <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.etc.dir" value="${build.dir}/etc"/>
- <property name="build.lib.dir" value="${build.dir}/lib"/>
- <property name="build.samples.dir" value="${build.dir}/samples"/>
- <property name="build.bin.dist" value="${build.dir}/bin-dist"/>
- <property name="build.src.dist" value="${build.dir}/src-dist"/>
- <property name="build.api-docs" value="${build.dir}/api-docs"/>
- <property name="docs.userguide.dir" value="${basedir}/docs/user-guide/project"/>
- <property name="jbossws.src.dir" value="${basedir}/../jbossws/src/main"/>
- <property name="jbossws.java.dir" value="${jbossws.src.dir}/java"/>
- <property name="jbossws.resources.dir" value="${jbossws.src.dir}/resources"/>
- <property name="test.dir" value="${basedir}/src/test"/>
- <property name="test.etc.dir" value="${test.dir}/etc"/>
- <property name="test.java.dir" value="${test.dir}/java"/>
- <property name="test.resources.dir" value="${test.dir}/resources"/>
-
- <property name="integration.jboss42.dir" value="${basedir}/../integration-jboss42"/>
- <property name="integration.jboss50.dir" value="${basedir}/../integration-jboss50"/>
- <property name="integration.tomcat.dir" value="${basedir}/../integration-tomcat"/>
-
- <property name="thirdparty.dir" value="${basedir}/thirdparty"/>
-
- <property name="jboss50.lib" value="${jboss50.home}/lib"/>
- <property name="jboss50.client" value="${jboss50.home}/client"/>
- <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
- <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
- <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
- <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
- <property name="jboss50.thirdparty" value="${jboss50.home}/../../../thirdparty"/>
-
- <property name="jboss42.lib" value="${jboss42.home}/lib"/>
- <property name="jboss42.client" value="${jboss42.home}/client"/>
- <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
- <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
- <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
- <property name="jboss42.thirdparty" value="${jboss42.home}/../../../thirdparty"/>
-
- <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
- <property name="tomcat.common.dir" value="${tomcat.home}/common"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <echo message="jboss50.home = ${jboss50.home}"/>
- <echo message="jboss42.home = ${jboss42.home}"/>
- <echo message="tomcat.home = ${tomcat.home}"/>
- <echo/>
-
- <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
- <available property="jboss50.ejb3.available" file="${jboss50.client}/jboss-ejb3-client.jar"/>
- <available property="jboss42.ejb3.available" file="${jboss42.client}/jboss-ejb3-client.jar"/>
- <available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/>
- <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/>
- <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/>
-
- <checksum file="version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
- <checksum file="version.properties" fileext=".md5"/>
-
- <condition property="force.thirdparty.get">
- <or>
- <not>
- <available file="${thirdparty.dir}" type="dir"/>
- </not>
- <isfalse value="${checksum.ok}"/>
- </or>
- </condition>
-
- <fail message="Not available: ${jboss50.client}/jboss-ejb3-client.jar" unless="jboss50.ejb3.available"/>
- <fail message="Not available: ${jboss42.client}/jboss-ejb3-client.jar" unless="jboss42.ejb3.available"/>
-
- <tstamp>
- <format property="build.id" pattern="yyyyMMddHHmm"/>
- </tstamp>
-
- </target>
-
<target name="init" depends="prepare, thirdparty">
-
- <!-- The combined compile classpath -->
- <path id="core.classpath">
- <path refid="library.classpath"/>
- <path refid="jboss.core.classpath"/>
- </path>
-
</target>
<!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>
-
- <!-- Compile java sources -->
- <target name="compile-classes" depends="compile-interfaces,compile-core,compile-integration"/>
-
- <!-- Compile core java sources -->
- <target name="compile-interfaces" depends="init">
- <mkdir dir="${build.classes14.dir}"/>
- <javac srcdir="${jbossws.java.dir}" destdir="${build.classes14.dir}" encoding="utf-8" 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/**"/>
- <classpath refid="core.classpath"/>
- </javac>
- </target>
-
- <!-- Compile core java sources -->
- <target name="compile-core" depends="compile-interfaces">
- <mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${jbossws.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="javax/xml/ws/**"/>
- <include name="javax/jws/**"/>
- <include name="org/jboss/ws/**"/>
- <exclude name="org/jboss/ws/integration/**"/>
- <classpath path="${build.classes14.dir}"/>
- <classpath refid="core.classpath"/>
- </javac>
- </target>
-
- <!-- Compile integration java sources -->
- <target name="compile-integration" depends="compile-jboss50-integration,compile-jboss42-integration,compile-tomcat-integration"/>
- <target name="compile-jboss50-integration" depends="compile-core">
- <mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${integration.jboss50.dir}/src/main/java" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/ws/integration/jboss50/**"/>
- <classpath path="${build.classes14.dir}"/>
- <classpath refid="jboss50.integration.classpath"/>
- <classpath refid="core.classpath"/>
- </javac>
- </target>
- <target name="compile-jboss42-integration" depends="compile-core">
- <mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${integration.jboss42.dir}/src/main/java" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/ws/integration/jboss42/**"/>
- <classpath path="${build.classes14.dir}"/>
- <classpath refid="jboss42.integration.classpath"/>
- <classpath refid="core.classpath"/>
- </javac>
- </target>
- <target name="compile-tomcat-integration" depends="compile-core">
- <mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${integration.tomcat.dir}/src/main/java" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/ws/integration/tomcat/**"/>
- <classpath path="${build.classes14.dir}"/>
- <classpath refid="tomcat.integration.classpath"/>
- <classpath refid="core.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${build.etc.dir}"/>
- <copy todir="${build.etc.dir}" filtering="yes" overwrite="yes">
- <fileset dir="${basedir}/etc"/>
- <filterset>
- <filter token="java.vm.version" value="${java.vm.version}"/>
- <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
<!--
| Build all jar files.
-->
- <target name="jars" description="Builds all jar files." depends="compile,module-jars">
+ <target name="jars" depends="init" description="Builds all jar files.">
+ <ant antfile="${jbossws.dir}/build.xml" target="jbossws-jars" dir="${jbossws.dir}" inheritall="false"/>
+ <ant antfile="${integration.jboss42.dir}/build.xml" target="jboss42-jars" inheritall="false"/>
+ <ant antfile="${integration.jboss50.dir}/build.xml" target="jboss50-jars" inheritall="false"/>
+ <ant antfile="${integration.tomcat.dir}/build.xml" target="tomcat-jars" inheritall="false"/>
</target>
- <!--
- | Build all jar files.
- -->
- <target name="module-jars">
-
- <!-- 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.dir}">
- <include name="javax/xml/rpc/**"/>
- </fileset>
- </jar>
-
- <!-- 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.dir}">
- <include name="javax/xml/soap/**"/>
- </fileset>
- <metainf dir="${jbossws.resources.dir}/jboss-saaj.jar/META-INF"/>
- </jar>
-
- <!-- Build jboss-jaxws.jar -->
- <mkdir dir="${build.lib.dir}"/>
- <jar jarfile="${build.lib.dir}/jboss-jaxws.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes.dir}">
- <include name="javax/jws/**"/>
- <include name="javax/xml/ws/**"/>
- <include name="org/jboss/ws/jaxws/injection/**"/>
- </fileset>
- </jar>
-
- <!-- Build jbossws-core.jar -->
- <mkdir dir="${build.lib.dir}"/>
- <jar jarfile="${build.lib.dir}/jbossws-core.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes.dir}">
- <include name="org/jboss/ws/**"/>
- <exclude name="org/jboss/ws/integration/**"/>
- </fileset>
- <fileset dir="${jbossws.resources.dir}">
- <include name="schema/**"/>
- <include name="dtd/**"/>
- </fileset>
- </jar>
-
- <!-- Build jbossws-jboss50-integration.jar -->
- <jar jarfile="${build.lib.dir}/jbossws-jboss50-integration.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes.dir}">
- <include name="org/jboss/ws/integration/*.class"/>
- <include name="org/jboss/ws/integration/jboss50/**"/>
- </fileset>
- </jar>
-
- <!-- Build jbossws-jboss42-integration.jar -->
- <jar jarfile="${build.lib.dir}/jbossws-jboss42-integration.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes.dir}">
- <include name="org/jboss/ws/integration/*.class"/>
- <include name="org/jboss/ws/integration/jboss42/**"/>
- </fileset>
- </jar>
-
- <!-- Build jbossws-tomcat-integration.jar -->
- <jar jarfile="${build.lib.dir}/jbossws-tomcat-integration.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes.dir}">
- <include name="org/jboss/ws/integration/tomcat/**"/>
- </fileset>
- </jar>
-
- <!-- Build jbossws-client.jar -->
- <jar jarfile="${build.lib.dir}/jbossws-client.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes14.dir}">
- <include name="javax/xml/rpc/**"/>
- <include name="javax/xml/soap/**"/>
- </fileset>
- <fileset dir="${build.classes.dir}">
- <include name="javax/xml/ws/**"/>
- <include name="javax/jws/**"/>
- <include name="org/jboss/ws/**"/>
- <exclude name="org/jboss/ws/integration/jboss50/**"/>
- <exclude name="org/jboss/ws/integration/tomcat/**"/>
- </fileset>
- <fileset dir="${jbossws.resources.dir}/jbossws.sar">
- <include name="META-INF/standard-jaxrpc-client-config.xml"/>
- <include name="META-INF/standard-jaxws-client-config.xml"/>
- </fileset>
- <fileset dir="${jbossws.resources.dir}">
- <include name="schema/**"/>
- <include name="dtd/**"/>
- </fileset>
- <fileset dir="${build.etc.dir}">
- <include name="wstools.sh"/>
- <include name="wstools.bat"/>
- <include name="wstools-log4j.xml"/>
- </fileset>
- <metainf dir="${jbossws.resources.dir}/jboss-saaj.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-context.war -->
- <war warfile="${build.lib.dir}/jbossws-context.war" webxml="${jbossws.resources.dir}/jbossws.war/JBoss/WEB-INF/web.xml">
- <fileset dir="${jbossws.resources.dir}/jbossws.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${jbossws.resources.dir}/jbossws.war/JBoss/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- Build jbossws.war -->
- <war warfile="${build.lib.dir}/jbossws.war" webxml="${jbossws.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml">
- <fileset dir="${jbossws.resources.dir}/jbossws.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <fileset dir="${jbossws.resources.dir}/jbossws.war/Tomcat">
- <include name="META-INF/jboss-beans.xml"/>
- </fileset>
- <fileset dir="${jbossws.resources.dir}/jbossws.sar">
- <include name="META-INF/standard-jaxrpc-client-config.xml"/>
- <include name="META-INF/standard-jaxrpc-endpoint-config.xml"/>
- <include name="META-INF/standard-jaxws-client-config.xml"/>
- <include name="META-INF/standard-jaxws-endpoint-config.xml"/>
- </fileset>
- <classes dir="${jbossws.resources.dir}/jbossws.war/Tomcat/WEB-INF">
- <include name="log4j.xml"/>
- </classes>
- </war>
-
- <!-- Build jbossws50.sar -->
- <jar jarfile="${build.lib.dir}/jbossws50.sar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.lib.dir}">
- <include name="jbossws-context.war"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="policy-1.0.jar"/>
- <include name="sjsxp.jar"/>
- <include name="stax-api-1.0.jar"/>
- <include name="wstx-lgpl-2.9.3.jar"/>
- <include name="xmlsec.jar"/>
- </fileset>
- <metainf dir="${jbossws.resources.dir}/jbossws.sar/META-INF">
- <include name="standard-jaxrpc-client-config.xml"/>
- <include name="standard-jaxrpc-endpoint-config.xml"/>
- <include name="standard-jaxws-client-config.xml"/>
- <include name="standard-jaxws-endpoint-config.xml"/>
- </metainf>
- </jar>
-
- <!-- Build jbossws.deployer -->
- <jar jarfile="${build.lib.dir}/jbossws50.deployer" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.lib.dir}">
- <include name="jbossws-jboss50-integration.jar"/>
- <include name="jbossws-core.jar"/>
- <include name="jboss-jaxws.jar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="wsdl4j.jar"/>
- </fileset>
- <metainf dir="${integration.jboss50.dir}/src/resources/jbossws.deployer/META-INF">
- <include name="jbossws-deployer-beans.xml"/>
- </metainf>
- </jar>
-
- <echo message="${integration.jboss42.dir}/src/resources/jbossws.sar"/>
-
- <!-- Build jbossws42.sar -->
- <jar jarfile="${build.lib.dir}/jbossws42.sar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.lib.dir}">
- <include name="jbossws-jboss42-integration.jar"/>
- <include name="jbossws-core.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jbossws-context.war"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="policy-1.0.jar"/>
- <include name="sjsxp.jar"/>
- <include name="stax-api-1.0.jar"/>
- <include name="wstx-lgpl-2.9.3.jar"/>
- <include name="xmlsec.jar"/>
- </fileset>
- <fileset dir="${integration.jboss42.dir}/src/resources">
- <include name="jbossws.beans/META-INF/jboss-beans.xml"/>
- </fileset>
- <metainf dir="${jbossws.resources.dir}/jbossws.sar/META-INF">
- <include name="standard-jaxrpc-client-config.xml"/>
- <include name="standard-jaxrpc-endpoint-config.xml"/>
- <include name="standard-jaxws-client-config.xml"/>
- <include name="standard-jaxws-endpoint-config.xml"/>
- </metainf>
- <metainf dir="${integration.jboss42.dir}/src/resources/jbossws.sar/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
-
+ <target name="build-docs" description="Build the documentation">
+ <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/>
</target>
- <!-- ================================================================== -->
- <!-- Documentation -->
- <!-- ================================================================== -->
-
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc">
-
- <mkdir dir="${build.api-docs}"/>
- <javadoc destdir="${build.api-docs}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <packageset dir="${jbossws.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/ws/**"/>
- </packageset>
- <packageset dir="${jboss.server.root}/../src/main" defaultexcludes="yes">
- <include name="org/jboss/webservice/metadata/**"/>
- </packageset>
-
- <doctitle><![CDATA[<h1>JBossWS</h1>]]></doctitle>
- <tag name="todo" scope="all" description="To do:"/>
- <group title="Core" packages="org.jboss.ws.core*"/>
- <group title="Metadata" packages="org.jboss.ws.metadata*"/>
- <group title="Integration" packages="org.jboss.ws.integration*"/>
- <group title="Extensions" packages="org.jboss.ws.extensions*"/>
- <group title="Tools" packages="org.jboss.ws.tools*"/>
- </javadoc>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws to the jboss50 -->
- <target name="deploy-jboss50" depends="main" description="Deploy jbossws">
- <copy todir="${jboss50.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
- <copy todir="${jboss50.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
- <copy todir="${jboss50.home}/client" overwrite="true">
- <fileset dir="${build.lib.dir}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="${build.lib.dir}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${build.lib.dir}/jbossws50.deployer"/>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${build.lib.dir}/jbossws50.sar"/>
- </target>
-
- <!-- Deploy jbossws to the jboss42 -->
- <target name="deploy-jboss42" depends="main" description="Deploy jbossws">
- <copy todir="${jboss42.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
- <copy todir="${jboss42.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
- <copy todir="${jboss42.home}/client" overwrite="true">
- <fileset dir="${build.lib.dir}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="${build.lib.dir}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${build.lib.dir}/jbossws42.sar"/>
- </target>
-
- <!-- Deploy to Tomcat -->
- <target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat">
- <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
- <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/>
- <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mailapi.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-core.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-jaxws.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-saaj.jar" overwrite="true"/>
- <copy todir="${tomcat.webapps.dir}" file="${build.lib.dir}/jbossws.war" overwrite="true"/>
- <delete dir="${tomcat.webapps.dir}/jbossws"/>
- </target>
-
- <target name="jbossws-thirdparty-jar" unless="jbossws.thirdparty.available">
- <!-- Build jbossws-thirdparty.jar -->
- <mkdir dir="${build.lib.dir}/build"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-common-core.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${jboss.server.lib}/jboss-j2ee.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-remoting.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-xml-binding.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/javassist.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/>
- <jar jarfile="${build.lib.dir}/jbossws-thirdparty.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.lib.dir}/build"/>
- </jar>
- <delete dir="${build.lib.dir}/build"/>
- </target>
-
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${build.dir}"/>
+ <delete dir="${output.dir}"/>
+ <ant antfile="${jbossws.dir}/build.xml" target="clean" inheritall="false"/>
+ <ant antfile="${integration.jboss42.dir}/build.xml" target="clean" inheritall="false"/>
+ <ant antfile="${integration.jboss50.dir}/build.xml" target="clean" inheritall="false"/>
+ <ant antfile="${integration.tomcat.dir}/build.xml" target="clean" inheritall="false"/>
</target>
- <target name="build-docs" description="Build the documentation">
- <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/>
- </target>
-
<target name="main" description="Executes the default target (most)." depends="most"/>
<target name="most" description="Builds almost everything." depends="jars"/>
Modified: trunk/build/import/build-release.xml
===================================================================
--- trunk/build/import/build-release.xml 2006-12-22 08:47:42 UTC (rev 1722)
+++ trunk/build/import/build-release.xml 2006-12-22 12:49:28 UTC (rev 1723)
@@ -100,7 +100,7 @@
<!-- Build the bin dist -->
<target name="build-bin-dist" description="Build the binary distribution"
- depends="main,jbossws-thirdparty-jar,build-samples,build-docs">
+ depends="main,tomcat-thirdparty-jar,build-samples,build-docs">
<mkdir dir="${build.bin.dist}"/>
<mkdir dir="${build.bin.dist}/bin"/>
Added: trunk/build/import/build-setup.xml
===================================================================
--- trunk/build/import/build-setup.xml 2006-12-22 08:47:42 UTC (rev 1722)
+++ trunk/build/import/build-setup.xml 2006-12-22 12:49:28 UTC (rev 1723)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project name="JBossWS-Setup">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property file="${basedir}/../build/ant.properties"/>
+ <property file="${basedir}/../build/version.properties"/>
+ <property environment="env"/>
+
+ <property name="build.dir" value="${basedir}/../build"/>
+ <property name="docs.dir" value="${basedir}/../docs"/>
+ <property name="integration.jboss42.dir" value="${basedir}/../integration-jboss42"/>
+ <property name="integration.jboss50.dir" value="${basedir}/../integration-jboss50"/>
+ <property name="integration.tomcat.dir" value="${basedir}/../integration-tomcat"/>
+ <property name="jbossws.dir" value="${basedir}/../jbossws"/>
+
+ <property name="docs.userguide.dir" value="${docs.dir}/user-guide/project"/>
+ <property name="output.etc.dir" value="${build.dir}/output/etc"/>
+ <property name="thirdparty.dir" value="${build.dir}/thirdparty"/>
+
+ <property name="jboss50.lib" value="${jboss50.home}/lib"/>
+ <property name="jboss50.client" value="${jboss50.home}/client"/>
+ <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
+ <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
+ <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
+ <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+ <property name="jboss50.thirdparty" value="${jboss50.home}/../../../thirdparty"/>
+
+ <property name="jboss42.lib" value="${jboss42.home}/lib"/>
+ <property name="jboss42.client" value="${jboss42.home}/client"/>
+ <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
+ <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
+ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+ <property name="jboss42.thirdparty" value="${jboss42.home}/../../../thirdparty"/>
+
+ <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
+ <property name="tomcat.common.dir" value="${tomcat.home}/common"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <echo message="jboss50.home = ${jboss50.home}"/>
+ <echo message="jboss42.home = ${jboss42.home}"/>
+ <echo message="tomcat.home = ${tomcat.home}"/>
+ <echo/>
+
+ <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
+ <available property="jboss50.ejb3.available" file="${jboss50.client}/jboss-ejb3-client.jar"/>
+ <available property="jboss42.ejb3.available" file="${jboss42.client}/jboss-ejb3-client.jar"/>
+ <available property="jbossws.thirdparty.available" file="${output.lib.dir}/jbossws-thirdparty.jar"/>
+ <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/>
+ <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/>
+
+ <checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
+ <checksum file="${build.dir}/version.properties" fileext=".md5"/>
+
+ <condition property="force.thirdparty.get">
+ <or>
+ <not>
+ <available file="${thirdparty.dir}" type="dir"/>
+ </not>
+ <isfalse value="${checksum.ok}"/>
+ </or>
+ </condition>
+
+ <fail message="Not available: ${jboss50.client}/jboss-ejb3-client.jar" unless="jboss50.ejb3.available"/>
+ <fail message="Not available: ${jboss42.client}/jboss-ejb3-client.jar" unless="jboss42.ejb3.available"/>
+
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: trunk/build/import/build-setup.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/build/import/build-thirdparty.xml
===================================================================
--- trunk/build/import/build-thirdparty.xml 2006-12-22 08:47:42 UTC (rev 1722)
+++ trunk/build/import/build-thirdparty.xml 2006-12-22 12:49:28 UTC (rev 1723)
@@ -104,6 +104,8 @@
<!-- The classpath for the jboss50 integration -->
<path id="jboss50.integration.classpath">
+ <path refid="library.classpath"/>
+ <path refid="jboss.core.classpath"/>
<pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
<pathelement location="${jboss50.lib}/jboss-jmx.jar"/>
<pathelement location="${jboss50.lib}/jboss-mbeans.jar"/>
@@ -116,6 +118,8 @@
<!-- The classpath for the jboss42 integration -->
<path id="jboss42.integration.classpath">
+ <path refid="library.classpath"/>
+ <path refid="jboss.core.classpath"/>
<pathelement location="${jboss42.lib}/jboss-jmx.jar"/>
<pathelement location="${jboss42.lib}/jboss-system.jar"/>
<pathelement location="${jboss42.server.lib}/jboss.jar"/>
18 years, 2 months
- 1
- 0