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