Author: alessio.soldano(a)jboss.com
Date: 2011-04-14 12:08:22 -0400 (Thu, 14 Apr 2011)
New Revision: 14102
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SecurityActions.java
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/
stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/
stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java
stack/native/trunk/pom.xml
Log:
Rollback Richard's changes that does not work with the current AS7 upstream master;
already moved to ropalka branch
svn merge -r 14089:14088
https://svn.jboss.org/repos/jbossws/stack/native/trunk .
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2011-04-14
16:02:35 UTC (rev 14101)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2011-04-14
16:08:22 UTC (rev 14102)
@@ -130,20 +130,14 @@
@Override
public void provide(String endpointClass)
{
- final ClassLoader origLoader = SecurityActions.getContextClassLoader();
try
{
- SecurityActions.setContextClassLoader(loader);
provide(loader.loadClass(endpointClass));
}
catch (ClassNotFoundException e)
{
throw new WSException("Class not found: " + endpointClass);
}
- finally
- {
- SecurityActions.setContextClassLoader(origLoader);
- }
}
@Override
Deleted:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SecurityActions.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SecurityActions.java 2011-04-14
16:02:35 UTC (rev 14101)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SecurityActions.java 2011-04-14
16:08:22 UTC (rev 14102)
@@ -1,89 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
- */
-
-package org.jboss.ws.tools.jaxws.impl;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * TCCL utility methods.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-final class SecurityActions
-{
-
- private SecurityActions()
- {
- // forbidden instantiation
- }
-
- /**
- * Get context classloader.
- *
- * @return the current context classloader
- */
- static ClassLoader getContextClassLoader()
- {
- SecurityManager sm = System.getSecurityManager();
- if (sm == null)
- {
- return Thread.currentThread().getContextClassLoader();
- }
- else
- {
- return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
{
- public ClassLoader run()
- {
- return Thread.currentThread().getContextClassLoader();
- }
- });
- }
- }
-
- /**
- * Set context classloader.
- *
- * @param classLoader the classloader
- */
- static void setContextClassLoader(final ClassLoader classLoader)
- {
- if (System.getSecurityManager() == null)
- {
- Thread.currentThread().setContextClassLoader(classLoader);
- }
- else
- {
- AccessController.doPrivileged(new PrivilegedAction<Object>()
- {
- public Object run()
- {
- Thread.currentThread().setContextClassLoader(classLoader);
- return null;
- }
- });
- }
- }
-
-
-}
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2011-04-14
16:02:35 UTC (rev 14101)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2011-04-14
16:08:22 UTC (rev 14102)
@@ -197,7 +197,6 @@
if (stream != null)
{
args.add("-verbose");
- args.add("-Xdebug");
}
else
{
Modified:
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
---
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-14
16:02:35 UTC (rev 14101)
+++
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-14
16:08:22 UTC (rev 14102)
@@ -28,23 +28,13 @@
</resources>
<dependencies>
- <module name="javax.api"/>
- <module name="javax.jws.api"/>
<module name="javax.wsdl4j.api" export="true"/>
- <module name="javax.xml.ws.api"/>
<module name="com.sun.xml.bind" services="export"
export="true"/>
- <module name="com.sun.tools.javac"/>
<module name="org.jboss.ws.api" export="true"/>
<module name="org.jboss.ws.spi" export="true"/>
<module name="org.jboss.ws.common" export="true"/>
<module name="org.jboss.ws.native.jbossws-native-factories"
services="export" export="true"/>
- <module name="org.jboss.ws.native.jbossws-native-core"
services="export" export="true">
- <imports>
- <include path="META-INF"/>
- <include path="dtd"/>
- <include path="schema"/>
- </imports>
- </module>
+ <module name="org.jboss.ws.native.jbossws-native-core"
services="export" export="true"/>
<module name="org.apache.xalan" services="export"
export="true"/>
<module name="org.apache.xerces" services="export"
export="true"/>
<module name="org.jboss.as.webservices" services="export"
export="true"/>
Modified:
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
===================================================================
---
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-14
16:02:35 UTC (rev 14101)
+++
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-14
16:08:22 UTC (rev 14102)
@@ -29,7 +29,6 @@
</resources>
<dependencies>
- <module name="gnu.getopt"/>
<module name="javax.api"/>
<module name="javax.annotation.api"/>
<module name="javax.ejb.api"/>
@@ -38,12 +37,10 @@
<module name="javax.wsdl4j.api" />
<module name="javax.xml.ws.api"/>
<module name="org.jboss.jaxbintros"/>
- <module name="org.jboss.modules"/>
<module name="org.jboss.ws.api"/>
<module name="org.jboss.ws.spi"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.common-core"/>
- <module name="org.apache.log4j"/>
<module name="org.apache.xerces" services="import"/>
</dependencies>
</module>
Modified:
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
---
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-04-14
16:02:35 UTC (rev 14101)
+++
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-04-14
16:08:22 UTC (rev 14102)
@@ -29,7 +29,6 @@
</resources>
<dependencies>
- <module name="com.sun.tools.ws" services="import"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="com.sun.xml.fastinfoset"/>
<module name="javax.api" />
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
---
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-14
16:02:35 UTC (rev 14101)
+++
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-14
16:08:22 UTC (rev 14102)
@@ -329,36 +329,11 @@
<include name="**/xmlsec.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/com/sun/tools/ws/main"
flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jaxws-tools.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/com/sun/xml/stream/buffer/main"
flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/streambuffer.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/com/sun/xml/ws/main"
flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jaxws-rt.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/com/sun/xml/ws/policy/main"
flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/policy.jar"/>
- </fileset>
- </copy>
<copy todir="@{targetdir}/com/sun/xml/fastinfoset/main"
flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/FastInfoset.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/org/jvnet/staxex/main"
flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/stax-ex.jar"/>
- </fileset>
- </copy>
<copy todir="@{targetdir}/org/codehaus/jettison/main"
flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jettison.jar"/>
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2011-04-14
16:02:35 UTC (rev 14101)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2011-04-14
16:08:22 UTC (rev 14102)
@@ -47,8 +47,6 @@
public void testWSToolsFromCommandLine() throws Exception
{
- if (!isTargetJBoss6()) return; // wstools.sh(.bat) not available since AS7
-
// use absolute path for the output to be re-usable
File dest = createResourceFile("wstools" + FS + "java");
dest.mkdirs();
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2011-04-14 16:02:35 UTC (rev 14101)
+++ stack/native/trunk/pom.xml 2011-04-14 16:08:22 UTC (rev 14102)
@@ -527,18 +527,6 @@
</profile>
<!--
- Name: jboss700
- Descr: JBoss-7.0.0 specific options
- -->
- <profile>
- <id>jboss700</id>
- <properties>
- <jbossws.integration.target>jboss700</jbossws.integration.target>
- <jboss.home>${jboss700.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: smoketest
Descr: Executes the smoke tests
-->