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