JBossWS SVN: r15991 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-16 10:30:43 -0400 (Fri, 16 Mar 2012)
New Revision: 15991
Modified:
stack/native/trunk/pom.xml
Log:
[JBPAPP-8189] removing stax:stax-api dependency
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2012-03-16 14:19:27 UTC (rev 15990)
+++ stack/native/trunk/pom.xml 2012-03-16 14:30:43 UTC (rev 15991)
@@ -268,6 +268,10 @@
<version>${sun.jaxws.version}</version>
<exclusions>
<exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
</exclusion>
@@ -376,6 +380,12 @@
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-lgpl</artifactId>
<version>${woodstox.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
14 years
- 1
- 0
JBossWS SVN: r15990 - stack/native/branches/jbossws-native-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-16 10:19:27 -0400 (Fri, 16 Mar 2012)
New Revision: 15990
Modified:
stack/native/branches/jbossws-native-4.0.x/
Log:
fix
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
Modified: svn:mergeinfo
- /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974
+ /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988
14 years
- 1
- 0
JBossWS SVN: r15989 - in stack/native/branches/jbossws-native-4.0.x: modules/core and 16 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-16 10:16:51 -0400 (Fri, 16 Mar 2012)
New Revision: 15989
Removed:
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/JsonEncoding.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/json/
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/JsonEncodingFeature.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.json
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/codehaus/jettison/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/json/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/json/
Modified:
stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/Message.properties
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/branches/jbossws-native-4.0.x/pom.xml
Log:
[JBPAPP-8478] Merged revisions 15988 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r15988 | ropalka | 2012-03-16 15:06:19 +0100 (Fri, 16 Mar 2012) | 1 line
[JBWS-3464] removing json feature
.......
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-03-16 14:16:51 UTC (rev 15989)
@@ -130,10 +130,6 @@
<artifactId>jaxws-tools</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- </dependency>
- <dependency>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</dependency>
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/JsonEncoding.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/JsonEncoding.java 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/JsonEncoding.java 2012-03-16 14:16:51 UTC (rev 15989)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.xml.ws.spi.WebServiceFeatureAnnotation;
-
-import org.jboss.ws.feature.JsonEncodingFeature;
-
-/**
- * This feature represents the use of JSON encoding
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 29-Feb-2008
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE })
-@EndpointFeature(id = JsonEncodingFeature.ID)
-@WebServiceFeatureAnnotation(id = JsonEncodingFeature.ID, bean = JsonEncodingFeature.class)
-public @interface JsonEncoding {
-
- /**
- * Specifies if the feature is enabled or disabled
- */
- boolean enabled() default true;
-}
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java 2012-03-16 14:16:51 UTC (rev 15989)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.core.client;
-
-import java.util.Map;
-
-import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPConstants;
-
-import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.jaxws.binding.JsonMessageMarshaller;
-import org.jboss.ws.core.jaxws.binding.JsonMessageUnMarshaller;
-import org.jboss.ws.core.soap.attachment.MimeConstants;
-
-/**
- * JSON remoting connection
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-Mar-2008
- */
-public class JsonConnectionHTTP extends HTTPRemotingConnection
-{
- public UnMarshaller getUnmarshaller()
- {
- return new JsonMessageUnMarshaller();
- }
-
- public Marshaller getMarshaller()
- {
- return new JsonMessageMarshaller();
- }
-
- @Override
- protected void populateHeaders(MessageAbstraction reqMessage, Map<String, Object> metadata)
- {
- // TODO: fix the content-type
- if (reqMessage != null)
- {
- MimeHeaders mimeHeaders = reqMessage.getMimeHeaders();
- mimeHeaders.setHeader(MimeConstants.CONTENT_TYPE, SOAPConstants.SOAP_1_1_CONTENT_TYPE);
- }
- super.populateHeaders(reqMessage, metadata);
- }
-}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2012-03-16 14:16:51 UTC (rev 15989)
@@ -26,7 +26,6 @@
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.api.util.ServiceLoader;
import org.jboss.ws.feature.FastInfosetFeature;
-import org.jboss.ws.feature.JsonEncodingFeature;
/**
* A factory for remote connections
@@ -55,10 +54,6 @@
{
key += ".fastinfoset";
}
- else if (epInfo.isFeatureEnabled(JsonEncodingFeature.class))
- {
- key += ".json";
- }
RemoteConnection con = (RemoteConnection)ServiceLoader.loadService(key, null, this.getClass().getClassLoader());
if (con == null)
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java 2012-03-16 14:16:51 UTC (rev 15989)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.core.jaxws.binding;
-
-import java.io.IOException;
-import java.util.ResourceBundle;
-import org.jboss.ws.api.util.BundleUtils;
-import java.io.OutputStream;
-
-import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.ws.core.client.Marshaller;
-import org.jboss.ws.core.soap.SOAPBodyImpl;
-import org.jboss.ws.core.soap.SOAPMessageImpl;
-import org.jboss.ws.extensions.json.BadgerFishDOMDocumentSerializer;
-
-/**
- * @author Thomas.Diesler(a)jboss.org
- * @author alessio.soldano(a)jboss.com
- * @since 25-Nov-2004
- */
-public class JsonMessageMarshaller implements Marshaller
-{
- private static final ResourceBundle bundle = BundleUtils.getBundle(JsonMessageMarshaller.class);
- /**
- * Marshaller will need to take the dataObject and convert
- * into primitive java data types and write to the
- * given output.
- *
- * @param dataObject Object to be writen to output
- * @param output The data output to write the object
- * data to.
- */
- public void write(Object dataObject, OutputStream output) throws IOException
- {
- // TODO: this should not be a SOAP message
- if ((dataObject instanceof SOAPMessageImpl) == false)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "NOT_A_SOAPMESSAGEIMPL", dataObject));
-
- try
- {
- SOAPMessage soapMessage = (SOAPMessage)dataObject;
- SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
- SOAPBodyElement payload = soapBody.getBodyElement();
- new BadgerFishDOMDocumentSerializer(output).serialize(payload);
- }
- catch (SOAPException ex)
- {
- IOException ioex = new IOException(BundleUtils.getMessage(bundle, "CANNOT_SERIALIZE", dataObject));
- ioex.initCause(ex);
- throw ioex;
- }
- }
-}
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java 2012-03-16 14:16:51 UTC (rev 15989)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.core.jaxws.binding;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.api.util.BundleUtils;
-import org.jboss.ws.core.client.UnMarshaller;
-import org.jboss.ws.core.soap.MessageFactoryImpl;
-import org.jboss.ws.extensions.json.BadgerFishDOMDocumentParser;
-import org.w3c.dom.Document;
-
-/**
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Nov-2004
- */
-public class JsonMessageUnMarshaller implements UnMarshaller
-{
- private static final ResourceBundle bundle = BundleUtils.getBundle(JsonMessageUnMarshaller.class);
- // Provide logging
- private static Logger log = Logger.getLogger(JsonMessageUnMarshaller.class);
-
- public Object read(InputStream inputStream, Map<String, Object> metadata, Map<String, Object> headers) throws IOException
- {
- if (log.isTraceEnabled())
- {
- log.trace("Read input stream with metadata=" + metadata);
- }
-
- // TODO: this should not be a SOAP message
- try
- {
- MessageFactoryImpl factory = new MessageFactoryImpl();
- SOAPMessage soapMsg = factory.createMessage();
- Document doc = new BadgerFishDOMDocumentParser().parse(inputStream);
- soapMsg.getSOAPBody().addDocument(doc);
- return soapMsg;
- }
- catch (SOAPException ex)
- {
- IOException ioex = new IOException(BundleUtils.getMessage(bundle, "CANNOT_UNMARSHALL_JSON_INPUT_STREAM"));
- ioex.initCause(ex);
- throw ioex;
- }
- }
-}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/Message.properties
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/Message.properties 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/Message.properties 2012-03-16 14:16:51 UTC (rev 15989)
@@ -5,7 +5,6 @@
CANNOT_SERIALIZE=Cannot serialize: {0}
CANNOT_SET_FAULT_MESSAGE_IN_MESSAGE_CONTEXT=Cannot set fault message in message context
NOT_A_HTTPMESSAGE=Not a HTTPMessage: {0}
-CANNOT_UNMARSHALL_JSON_INPUT_STREAM=Cannot unmarshall json input stream
UNSUPPORTED_BINDING=Unsupported binding: {0}
INVALID_HTTP_SERVER_RESPONSE=Invalid HTTP server response [{0}] - {1}
NONE_ROLE=Attempt to configure the binding to play the none role
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-16 14:16:51 UTC (rev 15989)
@@ -42,7 +42,6 @@
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
import org.jboss.ws.feature.ChunkedEncodingFeature;
import org.jboss.ws.feature.FastInfosetFeature;
-import org.jboss.ws.feature.JsonEncodingFeature;
import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData;
@@ -72,7 +71,6 @@
static
{
supportedFeatures.addFeature(new FastInfosetFeature());
- supportedFeatures.addFeature(new JsonEncodingFeature());
supportedFeatures.addFeature(new SchemaValidationFeature());
supportedFeatures.addFeature(new AddressingFeature());
supportedFeatures.addFeature(new MTOMFeature());
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/JsonEncodingFeature.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/JsonEncodingFeature.java 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/JsonEncodingFeature.java 2012-03-16 14:16:51 UTC (rev 15989)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.feature;
-
-import javax.xml.ws.WebServiceFeature;
-
-import org.jboss.ws.common.Constants;
-
-/**
- * This feature represents the use of JSON encoding
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 29-Feb-2008
- */
-public final class JsonEncodingFeature extends WebServiceFeature
-{
- /**
- * Constant value identifying the JSON encoding feature
- */
- public static final String ID = Constants.NS_JBOSSWS_URI + "/features/json";
-
- /**
- * Create an <code>JsonFeature</code>.
- * The instance created will be enabled.
- */
- public JsonEncodingFeature()
- {
- this.enabled = true;
- }
-
- /**
- * Creates an <code>JsonFeature</code>.
- *
- * @param enabled specifies if this feature should be enabled or not
- */
- public JsonEncodingFeature(boolean enabled)
- {
- this.enabled = enabled;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getID()
- {
- return ID;
- }
-}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-16 14:16:51 UTC (rev 15989)
@@ -40,13 +40,11 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.annotation.FastInfoset;
-import org.jboss.ws.annotation.JsonEncoding;
import org.jboss.ws.annotation.SchemaValidation;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.DOMWriter;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler;
import org.jboss.ws.feature.FastInfosetFeature;
-import org.jboss.ws.feature.JsonEncodingFeature;
import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
@@ -102,12 +100,6 @@
FastInfosetFeature feature = new FastInfosetFeature(anFeature.enabled());
sepMetaData.addFeature(feature);
}
- else if (an.annotationType() == JsonEncoding.class)
- {
- JsonEncoding anFeature = sepClass.getAnnotation(JsonEncoding.class);
- JsonEncodingFeature feature = new JsonEncodingFeature(anFeature.enabled());
- sepMetaData.addFeature(feature);
- }
else if (an.annotationType() == RespectBinding.class)
{
RespectBinding anFeature = sepClass.getAnnotation(RespectBinding.class);
@@ -234,7 +226,7 @@
feature.setSchemaLocation(xsdLoc);
}
- Class handlerClass = anFeature.errorHandler();
+ Class<?> handlerClass = anFeature.errorHandler();
if (handlerClass != null)
{
try
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-03-16 14:16:51 UTC (rev 15989)
@@ -21,7 +21,6 @@
CANNOT_OBTAIN_ENDPOINTMD=Cannot obtain endpoint meta data
CANNOT_OBTAIN_SOAPPART=Cannot obtain SOAPPart from response message
NOT_SUPPORTED_WITH_FASTINFOSET=Attachments not supported with FastInfoset
-NOT_SUPPORTED_WITH_JSON=Attachments not supported with JSON
CANNOT_OBTAIN_SEINVOKER=Cannot obtain ServiceEndpointInvoker
CANNOT_PROCESS_METRICS=Cannot process metrics
INVALID_ENDPOINT_ADDRESS=Invalid endpoint address: {0}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-16 14:16:51 UTC (rev 15989)
@@ -76,16 +76,12 @@
import org.jboss.ws.core.server.WSDLRequestHandler;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.MessageFactoryImpl;
-import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPConnectionImpl;
import org.jboss.ws.core.soap.SOAPMessageImpl;
import org.jboss.ws.core.utils.ThreadLocalAssociation;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
-import org.jboss.ws.extensions.json.BadgerFishDOMDocumentParser;
-import org.jboss.ws.extensions.json.BadgerFishDOMDocumentSerializer;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.feature.FastInfosetFeature;
-import org.jboss.ws.feature.JsonEncodingFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
@@ -441,17 +437,6 @@
serializer.setOutputStream(output);
serializer.serialize(soapEnv);
}
- // JSON support
- else if (epMetaData.isFeatureEnabled(JsonEncodingFeature.class) && resMessage instanceof SOAPMessage)
- {
- SOAPMessage soapMessage = (SOAPMessage)resMessage;
- if (soapMessage.getAttachments().hasNext())
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "NOT_SUPPORTED_WITH_JSON"));
-
- SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
- BadgerFishDOMDocumentSerializer serializer = new BadgerFishDOMDocumentSerializer(output);
- serializer.serialize(soapBody.getBodyElement());
- }
else
{
resMessage.writeTo(output);
@@ -495,14 +480,6 @@
{
reqMessage = new HTTPMessageImpl(headers, inputStream);
}
- else if (sepMetaData.isFeatureEnabled(JsonEncodingFeature.class))
- {
- MessageFactoryImpl factory = new MessageFactoryImpl();
- SOAPMessageImpl soapMsg = (SOAPMessageImpl)factory.createMessage();
- Document doc = new BadgerFishDOMDocumentParser().parse(inputStream);
- soapMsg.getSOAPBody().addDocument(doc);
- reqMessage = soapMsg;
- }
else
{
msgFactory.setServiceMode(sepMetaData.getServiceMode());
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.json
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.json 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.json 2012-03-16 14:16:51 UTC (rev 15989)
@@ -1 +0,0 @@
-org.jboss.ws.core.client.JsonConnectionHTTP
\ No newline at end of file
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-16 14:16:51 UTC (rev 15989)
@@ -46,7 +46,6 @@
<include>org.jboss.ws:jbossws-api:jar</include>
<include>org.jboss.ws:jbossws-common:jar</include>
<include>org.jboss.ws:jbossws-spi:jar</include>
- <include>org.codehaus.jettison:jettison:jar</include>
<include>com.sun.xml.ws:policy:jar</include>
<include>javax.xml.stream:stax-api:jar</include>
<include>org.jvnet.staxex:stax-ex:jar</include>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-16 14:16:51 UTC (rev 15989)
@@ -46,7 +46,6 @@
<module name="org.apache.santuario.xmlsec" />
<module name="org.apache.ws.commons.policy" optional="true"/>
<module name="org.javassist" />
- <module name="org.codehaus.jettison" optional="true"/>
<module name="org.jboss.netty" />
<module name="org.jboss.xb" />
<module name="org.jboss.ws.api" />
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-16 14:16:51 UTC (rev 15989)
@@ -128,11 +128,6 @@
<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"/>
- </fileset>
- </copy>
<copy todir="@{targetdir}/org/jboss/jaxbintros/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jboss-jaxb-intros.jar"/>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-16 14:16:51 UTC (rev 15989)
@@ -119,16 +119,6 @@
</metainf>
</jar>
- <!-- jaxws-json -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-json.war" webxml="${tests.output.dir}/test-resources/jaxws/json/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/json/JsonEndpoint.class" />
- </classes>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
<!-- jaxws-jaxbintros -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jaxbintros.war" webxml="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-16 14:06:19 UTC (rev 15988)
+++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-16 14:16:51 UTC (rev 15989)
@@ -66,7 +66,6 @@
<jboss711.version>7.1.1.Final</jboss711.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<ant.version>1.7.1</ant.version>
- <codehaus.jettison.version>1.3.1</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
<javassist.version>3.15.0-GA</javassist.version>
<jaxws.api.version>2.0.0.Final</jaxws.api.version>
@@ -323,11 +322,6 @@
<version>${stax.api.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>${codehaus.jettison.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
14 years
- 1
- 0
JBossWS SVN: r15988 - in stack/native/trunk: modules/core and 18 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-16 10:06:19 -0400 (Fri, 16 Mar 2012)
New Revision: 15988
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/JsonEncoding.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/json/
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/JsonEncodingFeature.java
stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.json
stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/codehaus/jettison/
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/jettison/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/json/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/json/
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/Message.properties
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/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/scripts/build-jars-jaxws.xml
stack/native/trunk/pom.xml
Log:
[JBWS-3464] removing json feature
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/core/pom.xml 2012-03-16 14:06:19 UTC (rev 15988)
@@ -130,10 +130,6 @@
<artifactId>jaxws-tools</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- </dependency>
- <dependency>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</dependency>
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/JsonEncoding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/JsonEncoding.java 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/JsonEncoding.java 2012-03-16 14:06:19 UTC (rev 15988)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.xml.ws.spi.WebServiceFeatureAnnotation;
-
-import org.jboss.ws.feature.JsonEncodingFeature;
-
-/**
- * This feature represents the use of JSON encoding
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 29-Feb-2008
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE })
-@EndpointFeature(id = JsonEncodingFeature.ID)
-@WebServiceFeatureAnnotation(id = JsonEncodingFeature.ID, bean = JsonEncodingFeature.class)
-public @interface JsonEncoding {
-
- /**
- * Specifies if the feature is enabled or disabled
- */
- boolean enabled() default true;
-}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java 2012-03-16 14:06:19 UTC (rev 15988)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.core.client;
-
-import java.util.Map;
-
-import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPConstants;
-
-import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.jaxws.binding.JsonMessageMarshaller;
-import org.jboss.ws.core.jaxws.binding.JsonMessageUnMarshaller;
-import org.jboss.ws.core.soap.attachment.MimeConstants;
-
-/**
- * JSON remoting connection
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-Mar-2008
- */
-public class JsonConnectionHTTP extends HTTPRemotingConnection
-{
- public UnMarshaller getUnmarshaller()
- {
- return new JsonMessageUnMarshaller();
- }
-
- public Marshaller getMarshaller()
- {
- return new JsonMessageMarshaller();
- }
-
- @Override
- protected void populateHeaders(MessageAbstraction reqMessage, Map<String, Object> metadata)
- {
- // TODO: fix the content-type
- if (reqMessage != null)
- {
- MimeHeaders mimeHeaders = reqMessage.getMimeHeaders();
- mimeHeaders.setHeader(MimeConstants.CONTENT_TYPE, SOAPConstants.SOAP_1_1_CONTENT_TYPE);
- }
- super.populateHeaders(reqMessage, metadata);
- }
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2012-03-16 14:06:19 UTC (rev 15988)
@@ -26,7 +26,6 @@
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.api.util.ServiceLoader;
import org.jboss.ws.feature.FastInfosetFeature;
-import org.jboss.ws.feature.JsonEncodingFeature;
/**
* A factory for remote connections
@@ -55,10 +54,6 @@
{
key += ".fastinfoset";
}
- else if (epInfo.isFeatureEnabled(JsonEncodingFeature.class))
- {
- key += ".json";
- }
RemoteConnection con = (RemoteConnection)ServiceLoader.loadService(key, null, this.getClass().getClassLoader());
if (con == null)
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java 2012-03-16 14:06:19 UTC (rev 15988)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.core.jaxws.binding;
-
-import java.io.IOException;
-import java.util.ResourceBundle;
-import org.jboss.ws.api.util.BundleUtils;
-import java.io.OutputStream;
-
-import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.ws.core.client.Marshaller;
-import org.jboss.ws.core.soap.SOAPBodyImpl;
-import org.jboss.ws.core.soap.SOAPMessageImpl;
-import org.jboss.ws.extensions.json.BadgerFishDOMDocumentSerializer;
-
-/**
- * @author Thomas.Diesler(a)jboss.org
- * @author alessio.soldano(a)jboss.com
- * @since 25-Nov-2004
- */
-public class JsonMessageMarshaller implements Marshaller
-{
- private static final ResourceBundle bundle = BundleUtils.getBundle(JsonMessageMarshaller.class);
- /**
- * Marshaller will need to take the dataObject and convert
- * into primitive java data types and write to the
- * given output.
- *
- * @param dataObject Object to be writen to output
- * @param output The data output to write the object
- * data to.
- */
- public void write(Object dataObject, OutputStream output) throws IOException
- {
- // TODO: this should not be a SOAP message
- if ((dataObject instanceof SOAPMessageImpl) == false)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "NOT_A_SOAPMESSAGEIMPL", dataObject));
-
- try
- {
- SOAPMessage soapMessage = (SOAPMessage)dataObject;
- SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
- SOAPBodyElement payload = soapBody.getBodyElement();
- new BadgerFishDOMDocumentSerializer(output).serialize(payload);
- }
- catch (SOAPException ex)
- {
- IOException ioex = new IOException(BundleUtils.getMessage(bundle, "CANNOT_SERIALIZE", dataObject));
- ioex.initCause(ex);
- throw ioex;
- }
- }
-}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java 2012-03-16 14:06:19 UTC (rev 15988)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.core.jaxws.binding;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.api.util.BundleUtils;
-import org.jboss.ws.core.client.UnMarshaller;
-import org.jboss.ws.core.soap.MessageFactoryImpl;
-import org.jboss.ws.extensions.json.BadgerFishDOMDocumentParser;
-import org.w3c.dom.Document;
-
-/**
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Nov-2004
- */
-public class JsonMessageUnMarshaller implements UnMarshaller
-{
- private static final ResourceBundle bundle = BundleUtils.getBundle(JsonMessageUnMarshaller.class);
- // Provide logging
- private static Logger log = Logger.getLogger(JsonMessageUnMarshaller.class);
-
- public Object read(InputStream inputStream, Map<String, Object> metadata, Map<String, Object> headers) throws IOException
- {
- if (log.isTraceEnabled())
- {
- log.trace("Read input stream with metadata=" + metadata);
- }
-
- // TODO: this should not be a SOAP message
- try
- {
- MessageFactoryImpl factory = new MessageFactoryImpl();
- SOAPMessage soapMsg = factory.createMessage();
- Document doc = new BadgerFishDOMDocumentParser().parse(inputStream);
- soapMsg.getSOAPBody().addDocument(doc);
- return soapMsg;
- }
- catch (SOAPException ex)
- {
- IOException ioex = new IOException(BundleUtils.getMessage(bundle, "CANNOT_UNMARSHALL_JSON_INPUT_STREAM"));
- ioex.initCause(ex);
- throw ioex;
- }
- }
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/Message.properties 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/Message.properties 2012-03-16 14:06:19 UTC (rev 15988)
@@ -5,7 +5,6 @@
CANNOT_SERIALIZE=Cannot serialize: {0}
CANNOT_SET_FAULT_MESSAGE_IN_MESSAGE_CONTEXT=Cannot set fault message in message context
NOT_A_HTTPMESSAGE=Not a HTTPMessage: {0}
-CANNOT_UNMARSHALL_JSON_INPUT_STREAM=Cannot unmarshall json input stream
UNSUPPORTED_BINDING=Unsupported binding: {0}
INVALID_HTTP_SERVER_RESPONSE=Invalid HTTP server response [{0}] - {1}
NONE_ROLE=Attempt to configure the binding to play the none role
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-16 14:06:19 UTC (rev 15988)
@@ -42,7 +42,6 @@
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
import org.jboss.ws.feature.ChunkedEncodingFeature;
import org.jboss.ws.feature.FastInfosetFeature;
-import org.jboss.ws.feature.JsonEncodingFeature;
import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData;
@@ -72,7 +71,6 @@
static
{
supportedFeatures.addFeature(new FastInfosetFeature());
- supportedFeatures.addFeature(new JsonEncodingFeature());
supportedFeatures.addFeature(new SchemaValidationFeature());
supportedFeatures.addFeature(new AddressingFeature());
supportedFeatures.addFeature(new MTOMFeature());
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/JsonEncodingFeature.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/JsonEncodingFeature.java 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/JsonEncodingFeature.java 2012-03-16 14:06:19 UTC (rev 15988)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.feature;
-
-import javax.xml.ws.WebServiceFeature;
-
-import org.jboss.ws.common.Constants;
-
-/**
- * This feature represents the use of JSON encoding
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 29-Feb-2008
- */
-public final class JsonEncodingFeature extends WebServiceFeature
-{
- /**
- * Constant value identifying the JSON encoding feature
- */
- public static final String ID = Constants.NS_JBOSSWS_URI + "/features/json";
-
- /**
- * Create an <code>JsonFeature</code>.
- * The instance created will be enabled.
- */
- public JsonEncodingFeature()
- {
- this.enabled = true;
- }
-
- /**
- * Creates an <code>JsonFeature</code>.
- *
- * @param enabled specifies if this feature should be enabled or not
- */
- public JsonEncodingFeature(boolean enabled)
- {
- this.enabled = enabled;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getID()
- {
- return ID;
- }
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-16 14:06:19 UTC (rev 15988)
@@ -40,13 +40,11 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.annotation.FastInfoset;
-import org.jboss.ws.annotation.JsonEncoding;
import org.jboss.ws.annotation.SchemaValidation;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.DOMWriter;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler;
import org.jboss.ws.feature.FastInfosetFeature;
-import org.jboss.ws.feature.JsonEncodingFeature;
import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
@@ -102,12 +100,6 @@
FastInfosetFeature feature = new FastInfosetFeature(anFeature.enabled());
sepMetaData.addFeature(feature);
}
- else if (an.annotationType() == JsonEncoding.class)
- {
- JsonEncoding anFeature = sepClass.getAnnotation(JsonEncoding.class);
- JsonEncodingFeature feature = new JsonEncodingFeature(anFeature.enabled());
- sepMetaData.addFeature(feature);
- }
else if (an.annotationType() == RespectBinding.class)
{
RespectBinding anFeature = sepClass.getAnnotation(RespectBinding.class);
@@ -234,7 +226,7 @@
feature.setSchemaLocation(xsdLoc);
}
- Class handlerClass = anFeature.errorHandler();
+ Class<?> handlerClass = anFeature.errorHandler();
if (handlerClass != null)
{
try
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-03-16 14:06:19 UTC (rev 15988)
@@ -21,7 +21,6 @@
CANNOT_OBTAIN_ENDPOINTMD=Cannot obtain endpoint meta data
CANNOT_OBTAIN_SOAPPART=Cannot obtain SOAPPart from response message
NOT_SUPPORTED_WITH_FASTINFOSET=Attachments not supported with FastInfoset
-NOT_SUPPORTED_WITH_JSON=Attachments not supported with JSON
CANNOT_OBTAIN_SEINVOKER=Cannot obtain ServiceEndpointInvoker
CANNOT_PROCESS_METRICS=Cannot process metrics
INVALID_ENDPOINT_ADDRESS=Invalid endpoint address: {0}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-16 14:06:19 UTC (rev 15988)
@@ -76,16 +76,12 @@
import org.jboss.ws.core.server.WSDLRequestHandler;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.MessageFactoryImpl;
-import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPConnectionImpl;
import org.jboss.ws.core.soap.SOAPMessageImpl;
import org.jboss.ws.core.utils.ThreadLocalAssociation;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
-import org.jboss.ws.extensions.json.BadgerFishDOMDocumentParser;
-import org.jboss.ws.extensions.json.BadgerFishDOMDocumentSerializer;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.feature.FastInfosetFeature;
-import org.jboss.ws.feature.JsonEncodingFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
@@ -441,17 +437,6 @@
serializer.setOutputStream(output);
serializer.serialize(soapEnv);
}
- // JSON support
- else if (epMetaData.isFeatureEnabled(JsonEncodingFeature.class) && resMessage instanceof SOAPMessage)
- {
- SOAPMessage soapMessage = (SOAPMessage)resMessage;
- if (soapMessage.getAttachments().hasNext())
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "NOT_SUPPORTED_WITH_JSON"));
-
- SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
- BadgerFishDOMDocumentSerializer serializer = new BadgerFishDOMDocumentSerializer(output);
- serializer.serialize(soapBody.getBodyElement());
- }
else
{
resMessage.writeTo(output);
@@ -495,14 +480,6 @@
{
reqMessage = new HTTPMessageImpl(headers, inputStream);
}
- else if (sepMetaData.isFeatureEnabled(JsonEncodingFeature.class))
- {
- MessageFactoryImpl factory = new MessageFactoryImpl();
- SOAPMessageImpl soapMsg = (SOAPMessageImpl)factory.createMessage();
- Document doc = new BadgerFishDOMDocumentParser().parse(inputStream);
- soapMsg.getSOAPBody().addDocument(doc);
- reqMessage = soapMsg;
- }
else
{
msgFactory.setServiceMode(sepMetaData.getServiceMode());
Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.json
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.json 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.json 2012-03-16 14:06:19 UTC (rev 15988)
@@ -1 +0,0 @@
-org.jboss.ws.core.client.JsonConnectionHTTP
\ No newline at end of file
Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-16 14:06:19 UTC (rev 15988)
@@ -46,7 +46,6 @@
<include>org.jboss.ws:jbossws-api:jar</include>
<include>org.jboss.ws:jbossws-common:jar</include>
<include>org.jboss.ws:jbossws-spi:jar</include>
- <include>org.codehaus.jettison:jettison:jar</include>
<include>com.sun.xml.ws:policy:jar</include>
<include>javax.xml.stream:stax-api:jar</include>
<include>org.jvnet.staxex:stax-ex:jar</include>
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-16 14:06:19 UTC (rev 15988)
@@ -46,7 +46,6 @@
<module name="org.apache.santuario.xmlsec" />
<module name="org.apache.ws.commons.policy" optional="true"/>
<module name="org.javassist" />
- <module name="org.codehaus.jettison" optional="true"/>
<module name="org.jboss.netty" />
<module name="org.jboss.xb" />
<module name="org.jboss.ws.api" />
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-16 14:06:19 UTC (rev 15988)
@@ -46,7 +46,6 @@
<module name="org.apache.santuario.xmlsec" />
<module name="org.apache.ws.commons.policy" optional="true"/>
<module name="org.javassist" />
- <module name="org.codehaus.jettison" optional="true"/>
<module name="org.jboss.netty" />
<module name="org.jboss.xb" />
<module name="org.jboss.ws.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 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-16 14:06:19 UTC (rev 15988)
@@ -128,11 +128,6 @@
<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"/>
- </fileset>
- </copy>
<copy todir="@{targetdir}/org/jboss/jaxbintros/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jboss-jaxb-intros.jar"/>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-16 14:06:19 UTC (rev 15988)
@@ -119,16 +119,6 @@
</metainf>
</jar>
- <!-- jaxws-json -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-json.war" webxml="${tests.output.dir}/test-resources/jaxws/json/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/json/JsonEndpoint.class" />
- </classes>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
<!-- jaxws-jaxbintros -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jaxbintros.war" webxml="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2012-03-16 12:14:06 UTC (rev 15987)
+++ stack/native/trunk/pom.xml 2012-03-16 14:06:19 UTC (rev 15988)
@@ -74,7 +74,6 @@
<jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<ant.version>1.7.1</ant.version>
- <codehaus.jettison.version>1.3.1</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
<javassist.version>3.15.0-GA</javassist.version>
<jaxws.api.version>2.0.0.Final</jaxws.api.version>
@@ -364,11 +363,6 @@
<version>${stax.api.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>${codehaus.jettison.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
14 years
- 1
- 0
JBossWS SVN: r15987 - stack/native/branches/jbossws-native-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-16 08:14:06 -0400 (Fri, 16 Mar 2012)
New Revision: 15987
Modified:
stack/native/branches/jbossws-native-4.0.x/
Log:
Blocked revisions 15978 via svnmerge
.......
r15978 | ropalka | 2012-03-16 12:35:02 +0100 (Fri, 16 Mar 2012) | 1 line
use jbossws-common-tools trunk & freeze jbossws-api
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,...
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,...
14 years
- 1
- 0
JBossWS SVN: r15986 - in stack/native/branches/jbossws-native-4.0.x: modules/dist/src/main/distro and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-16 08:13:10 -0400 (Fri, 16 Mar 2012)
New Revision: 15986
Removed:
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-project-gen.xml
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/user-project-build.xml
Modified:
stack/native/branches/jbossws-native-4.0.x/
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml
stack/native/branches/jbossws-native-4.0.x/pom.xml
Log:
[JBPAPP-8475] Merged revisions 15974 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r15974 | ropalka | 2012-03-16 12:07:10 +0100 (Fri, 16 Mar 2012) | 1 line
[JBWS-3461] removing project generator
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
Modified: svn:mergeinfo
- /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944
+ /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-project-gen.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-project-gen.xml 2012-03-16 12:06:46 UTC (rev 15985)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-project-gen.xml 2012-03-16 12:13:10 UTC (rev 15986)
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, 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.
- -->
-
-<project>
-
- <target name="init-project-properties" depends="tests-init">
- <fail message="Did you copy the ant.properties.example to ant.properties?" unless="jboss.home"/>
- <property file="./user-project.properties" />
- <property name="project.home" value="${workspace.home}/${project.name}"/>
-
- <filterset id="project">
- <filter token="projectName" value="${project.name}" />
- <filter token="jbossHome" value="${project.jboss.home}" />
- </filterset>
-
- <path id="jbws-ant.path">
- <pathelement location="${jboss.client}/jbossws-common-tools.jar" />
- <fileset dir="${jboss.home}">
- <include name="modules/**/jbossws-common-tools*.jar"/>
- </fileset>
- </path>
- <taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/>
- <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/>
- <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/>
- <taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/>
-
- </target>
-
- <target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project">
- <property file="./user-project.properties" prefix="old" />
-
- <echo message="-------------------------------------------------"/>
- <echo message=" Welcome to the JBossWS user project generator"/>
- <echo message="-------------------------------------------------"/>
- <echo message=""/>
-
- <property name="old.workspace.home" value="C:/Projects"/>
- <input addproperty="workspace.home.new"
- message="Enter your Java project workspace (the directory that contains your projects) "
- defaultvalue="${old.workspace.home}"/>
- <pathFixer property="workspace.home.new" />
-
- <property name="old.project.name" value="myproject"/>
- <input addproperty="project.name.new"
- message="Enter the project name "
- defaultvalue="${old.project.name}"/>
-
- <property name="old.project.type" value="jar"/>
- <input addproperty="project.type.new"
- message="Is this project deployed as an JAR (with EJB3 components) or a WAR (with no EJB3 support) "
- validargs="jar,war"
- defaultvalue="${old.project.type}"/>
-
- <delete file="user-project.properties"/>
- <propertyfile file="user-project.properties" comment="Generated by JBossWS user project setup">
- <entry key="workspace.home" value="${workspace.home.new}"/>
- <entry key="project.name" value="${project.name.new}"/>
- <entry key="project.type" value="${project.type.new}"/>
- <entry key="project.jboss.home" value="${jboss.home}"/>
- </propertyfile>
-
- <echo message=""/>
- <echo message="Your project settings have been saved in file 'user-project.properties'."/>
- <echo message="Please type 'ant create-project' to create the new project."/>
- </target>
-
- <target name="create-project" depends="validate-settings, configure-project" description="Create a new user project">
- <echo message="A basic webservice project named '${project.name}' has been created in the ${workspace.home} directory."/>
- <echo message="It includes a simple Ant build file and references the required libraries."/>
- <echo message="Please refer to http://community.jboss.org/wiki/JBossWS for the authoritative documentation."/>
- <echo message=""/>
- <echo message="If you are an Eclipse user, import the project into Eclipse: right click in "/>
- <echo message="'Package Explorer -> Import...' and select 'General -> Existing Projects into Workspace'."/>
- <echo message="Then click on 'Next' and set the root directory browsing to your workspace directory."/>
- </target>
-
- <target name="validate-settings" depends="init-project-properties">
- <fail message="No project name specified (run 'ant setup-new-project' first)">
- <condition>
- <or>
- <not><isset property="project.name"/></not>
- <equals arg1="${project.name}" arg2=""/>
- </or>
- </condition>
- </fail>
- <fail message="No project workspace specified (run 'ant setup-new-project' first)">
- <condition>
- <or>
- <not><isset property="workspace.home"/></not>
- <equals arg1="${workspace.home}" arg2=""/>
- </or>
- </condition>
- </fail>
- </target>
-
- <target name="configure-project">
- <mkdir dir="${project.home}/src/main/java"/>
- <mkdir dir="${project.home}/src/main/resources"/>
- <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml">
- <filterset refid="project"/>
- </copy>
- <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/>
- <path id="project.classpath">
- <fileset dir="${jboss.home}/modules/javax/xml/bind/api/main/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/com/sun/xml/bind/main/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/ws">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/javax/jws/api/main/">
- <include name="*.jar"/>
- </fileset>
- <path refid="integration.target.javac.classpath" />
- </path>
- <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" />
- <eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" />
- <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" />
- </target>
-
- <target name="delete-project" depends="validate-settings" description="Delete the configured user project">
- <echo message="Deleting the entire project in ${project.home}" />
- <delete dir="${project.home}" />
- </target>
-
- <target name="settings" depends="init-project-properties" description="Print the current project settings">
- <echo message="Java project workspace: ${workspace.home}"/>
- <echo message="JBoss home: ${project.jboss.home}"/>
- <echo message="JBoss conf: ${project.jboss.conf}"/>
- <echo message="Project name: ${project.name}"/>
- <echo message="Project type: ${project.type}"/>
- </target>
-
-</project>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml 2012-03-16 12:06:46 UTC (rev 15985)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml 2012-03-16 12:13:10 UTC (rev 15986)
@@ -47,7 +47,6 @@
<import file="${build.dir}/build-deploy.xml"/>
<import file="${build.dir}/jbossws-deploy-macros.xml"/>
<import file="${tests.dir}/ant-import/build-testsuite.xml"/>
- <import file="${build.dir}/build-project-gen.xml"/>
<!-- ================================================================== -->
<!-- Initialization -->
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/user-project-build.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/user-project-build.xml 2012-03-16 12:06:46 UTC (rev 15985)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/user-project-build.xml 2012-03-16 12:13:10 UTC (rev 15986)
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<project name="@projectName@" default="deploy" basedir="." >
-
- <property file="${basedir}/build.properties" />
- <import file="libraries.xml" />
-
- <!-- set global properties for this build -->
- <property name="project.name" value="@projectName@" />
- <property name="dist.dir" value="dist" />
- <condition property="deploy.dir" value="${project.jboss.home}/server/${project.jboss.conf}/deploy">
- <available file="${project.jboss.home}/server" type="dir"/>
- </condition>
- <condition property="deploy.dir" value="${project.jboss.home}/${project.jboss.conf}/deployments">
- <available file="${project.jboss.home}/${project.jboss.conf}" type="dir"/>
- </condition>
- <property name="output.dir" value="output" />
- <property name="src.main.dir" value="src/main/java" />
- <property name="resources.main.dir" value="src/main/resources" />
- <property name="classes.main.dir" value="classes/main/java" />
- <property name="javac.debug" value="true" />
- <property name="javac.deprecation" value="false" />
-
- <condition property="project.war" value="true">
- <equals arg1="${project.type}" arg2="war"/>
- </condition>
-
- <target name="clean">
- <delete dir="${output.dir}" />
- <delete dir="${dist.dir}" />
- </target>
-
- <target name="init">
- <mkdir dir="${output.dir}" />
- <mkdir dir="${dist.dir}" />
- </target>
-
- <target name="compile" depends="init" description="Compile the Java source code" unless="eclipse.running">
- <tstamp/>
- <javac destdir="${output.dir}" classpathref="project.classpath" debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="on">
- <src path="${src.main.dir}" />
- </javac>
- </target>
-
- <target name="copyclasses" depends="init" description="Copy the classes that were compiled by Eclipse" if="eclipse.running">
- <copy todir="${output.dir}">
- <fileset dir="${classes/main}">
- <include name="**/*.class"/>
- </fileset>
- </copy>
- </target>
-
- <target name="dist" depends="clean,compile,copyclasses" description="Create the application distribution archive">
- <fail unless="project.type">project.type not set</fail>
- <jar jarfile="${dist.dir}/${project.name}.${project.type}">
- <fileset dir="${output.dir}" />
- <fileset dir="${resources.main.dir}">
- <include name="META-INF/**"/>
- <include name="WEB-INF/**" if="project.war" />
- </fileset>
- </jar>
- </target>
-
- <target name="deploy" depends="dist" description="Deploy to JBoss AS">
- <fail unless="project.jboss.home">project.jboss.home not set</fail>
- <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.${project.type}" />
- </target>
-
- <target name="undeploy" description="Undeploy from JBoss AS">
- <fail unless="project.jboss.home">project.jboss.home not set</fail>
- <fail unless="project.jboss.conf">project.jboss.conf not set</fail>
- <delete file="${deploy.dir}/${project.name}.${project.type}" />
- </target>
-
-</project>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-03-16 12:06:46 UTC (rev 15985)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-03-16 12:13:10 UTC (rev 15986)
@@ -31,8 +31,6 @@
<includes>
<include>build-deploy.xml</include>
<include>build-setup.xml</include>
- <include>build-project-gen.xml</include>
- <include>user-project-build.xml</include>
</includes>
</fileSet>
<fileSet>
@@ -106,13 +104,11 @@
<include>java/org/jboss/test/ws/jaxws/smoke/**</include>
<include>java/org/jboss/test/ws/appclient/**</include>
<include>java/org/jboss/test/ws/management/**</include>
- <include>java/org/jboss/test/ws/projectGenerator/**</include>
<include>java/org/jboss/test/ws/saaj/**</include>
<include>resources/jaxrpc/samples/**</include>
<include>resources/jaxws/samples/**</include>
<include>resources/jaxws/smoke/**</include>
<include>resources/management/**</include>
- <include>resources/projectGenerator/**</include>
<include>resources/saaj/**</include>
</includes>
</unpackOptions>
Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-16 12:06:46 UTC (rev 15985)
+++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-16 12:13:10 UTC (rev 15986)
@@ -61,7 +61,7 @@
<jbossws.api.version>1.0.0.GA</jbossws.api.version>
<jbossws.spi.version>2.0.4-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>2.0.3-SNAPSHOT</jbossws.common.version>
- <jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version>
+ <jbossws.common.tools.version>1.0.1-SNAPSHOT</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.3-SNAPSHOT</jbossws.shared.testsuite.version>
<jboss711.version>7.1.1.Final</jboss711.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
14 years
- 1
- 0
JBossWS SVN: r15985 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-16 08:06:46 -0400 (Fri, 16 Mar 2012)
New Revision: 15985
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
Log:
Blocked revisions 15979 via svnmerge
.......
r15979 | ropalka | 2012-03-16 12:36:29 +0100 (Fri, 16 Mar 2012) | 1 line
use jbossws-common-tools trunk & freeze jbossws-api
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
14 years
- 1
- 0
JBossWS SVN: r15984 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/dist and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-16 08:05:37 -0400 (Fri, 16 Mar 2012)
New Revision: 15984
Removed:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-project-gen.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/user-project-build.xml
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml
stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
Log:
[JBPAPP-8475] Merged revisions 15973 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r15973 | ropalka | 2012-03-16 12:06:18 +0100 (Fri, 16 Mar 2012) | 1 line
[JBWS-3461] removing project generator
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-03-16 11:57:34 UTC (rev 15983)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-03-16 12:05:37 UTC (rev 15984)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Web Services - Stack CXF Distrubiton</name>
+ <name>JBoss Web Services - Stack CXF Distribution</name>
<artifactId>jbossws-cxf-dist</artifactId>
<packaging>pom</packaging>
<version>4.0.3-SNAPSHOT</version>
Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-project-gen.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-project-gen.xml 2012-03-16 11:57:34 UTC (rev 15983)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-project-gen.xml 2012-03-16 12:05:37 UTC (rev 15984)
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ 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.
- -->
-
-<project>
-
- <target name="init-project-properties" depends="tests-init">
- <fail message="Did you copy the ant.properties.example to ant.properties?" unless="jboss.home"/>
- <property file="./user-project.properties" />
- <property name="project.home" value="${workspace.home}/${project.name}"/>
-
- <filterset id="project">
- <filter token="projectName" value="${project.name}" />
- <filter token="jbossHome" value="${project.jboss.home}" />
- </filterset>
-
- <path id="jbws-ant.path">
- <pathelement location="${thirdparty.dir}/jbossws-common-tools.jar" />
- </path>
- <taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/>
- <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/>
- <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/>
- <taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/>
-
- </target>
-
- <target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project">
- <property file="./user-project.properties" prefix="old" />
-
- <echo message="-------------------------------------------------"/>
- <echo message=" Welcome to the JBossWS user project generator"/>
- <echo message="-------------------------------------------------"/>
- <echo message=""/>
-
- <property name="old.workspace.home" value="C:/Projects"/>
- <input addproperty="workspace.home.new"
- message="Enter your Java project workspace (the directory that contains your projects) "
- defaultvalue="${old.workspace.home}"/>
- <pathFixer property="workspace.home.new" />
-
- <property name="old.project.name" value="myproject"/>
- <input addproperty="project.name.new"
- message="Enter the project name "
- defaultvalue="${old.project.name}"/>
-
- <property name="old.project.type" value="jar"/>
- <input addproperty="project.type.new"
- message="Is this project deployed as an JAR (with EJB3 components) or a WAR (with no EJB3 support) "
- validargs="jar,war"
- defaultvalue="${old.project.type}"/>
-
- <delete file="user-project.properties"/>
- <propertyfile file="user-project.properties" comment="Generated by JBossWS user project setup">
- <entry key="workspace.home" value="${workspace.home.new}"/>
- <entry key="project.name" value="${project.name.new}"/>
- <entry key="project.type" value="${project.type.new}"/>
- <entry key="project.jboss.home" value="${jboss.home}"/>
- </propertyfile>
-
- <echo message=""/>
- <echo message="Your project settings have been saved in file 'user-project.properties'."/>
- <echo message="Please type 'ant create-project' to create the new project."/>
- </target>
-
- <target name="create-project" depends="validate-settings, configure-project" description="Create a new user project">
- <echo message="A basic webservice project named '${project.name}' has been created in the ${workspace.home} directory."/>
- <echo message="It includes a simple Ant build file and references the required libraries."/>
- <echo message="Please refer to http://community.jboss.org/wiki/JBossWS for the authoritative documentation."/>
- <echo message=""/>
- <echo message="If you are an Eclipse user, import the project into Eclipse: right click in "/>
- <echo message="'Package Explorer -> Import...' and select 'General -> Existing Projects into Workspace'."/>
- <echo message="Then click on 'Next' and set the root directory browsing to your workspace directory."/>
- </target>
-
- <target name="validate-settings" depends="init-project-properties">
- <fail message="No project name specified (run 'ant setup-new-project' first)">
- <condition>
- <or>
- <not><isset property="project.name"/></not>
- <equals arg1="${project.name}" arg2=""/>
- </or>
- </condition>
- </fail>
- <fail message="No project workspace specified (run 'ant setup-new-project' first)">
- <condition>
- <or>
- <not><isset property="workspace.home"/></not>
- <equals arg1="${workspace.home}" arg2=""/>
- </or>
- </condition>
- </fail>
- </target>
-
- <target name="configure-project">
- <mkdir dir="${project.home}/src/main/java"/>
- <mkdir dir="${project.home}/src/main/resources"/>
- <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml">
- <filterset refid="project"/>
- </copy>
- <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/>
- <path id="project.classpath">
- <fileset dir="${jboss.home}/modules/org/apache/cxf/main/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/javax/xml/bind/api/main/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/com/sun/xml/bind/main/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/ws">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/javax/jws/api/main/">
- <include name="*.jar"/>
- </fileset>
- <path refid="integration.target.javac.classpath" />
- </path>
- <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" />
- <eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" />
- <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" />
- </target>
-
- <target name="delete-project" depends="validate-settings" description="Delete the configured user project">
- <echo message="Deleting the entire project in ${project.home}" />
- <delete dir="${project.home}" />
- </target>
-
- <target name="settings" depends="init-project-properties" description="Print the current project settings">
- <echo message="Java project workspace: ${workspace.home}"/>
- <echo message="JBoss home: ${project.jboss.home}"/>
- <echo message="JBoss conf: ${project.jboss.conf}"/>
- <echo message="Project name: ${project.name}"/>
- <echo message="Project type: ${project.type}"/>
- </target>
-
-</project>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml 2012-03-16 11:57:34 UTC (rev 15983)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml 2012-03-16 12:05:37 UTC (rev 15984)
@@ -47,7 +47,6 @@
<import file="${build.dir}/build-deploy.xml"/>
<import file="${build.dir}/jbossws-deploy-macros.xml"/>
<import file="${tests.dir}/ant-import/build-testsuite.xml"/>
- <import file="${build.dir}/build-project-gen.xml"/>
<!-- ================================================================== -->
<!-- Initialization -->
Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/user-project-build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/user-project-build.xml 2012-03-16 11:57:34 UTC (rev 15983)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/user-project-build.xml 2012-03-16 12:05:37 UTC (rev 15984)
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<project name="@projectName@" default="deploy" basedir="." >
-
- <property file="${basedir}/build.properties" />
- <import file="libraries.xml" />
-
- <!-- set global properties for this build -->
- <property name="project.name" value="@projectName@" />
- <property name="dist.dir" value="dist" />
-
- <condition property="deploy.dir" value="${project.jboss.home}/server/${project.jboss.conf}/deploy">
- <available file="${project.jboss.home}/server" type="dir"/>
- </condition>
- <condition property="deploy.dir" value="${project.jboss.home}/${project.jboss.conf}/deployments">
- <available file="${project.jboss.home}/${project.jboss.conf}" type="dir"/>
- </condition>
-
- <property name="output.dir" value="output" />
- <property name="src.main.dir" value="src/main/java" />
- <property name="resources.main.dir" value="src/main/resources" />
- <property name="classes.main.dir" value="classes/main/java" />
- <property name="javac.debug" value="true" />
- <property name="javac.deprecation" value="false" />
-
- <condition property="project.war" value="true">
- <equals arg1="${project.type}" arg2="war"/>
- </condition>
-
- <target name="clean">
- <delete dir="${output.dir}" />
- <delete dir="${dist.dir}" />
- </target>
-
- <target name="init">
- <mkdir dir="${output.dir}" />
- <mkdir dir="${dist.dir}" />
- </target>
-
- <target name="compile" depends="init" description="Compile the Java source code" unless="eclipse.running">
- <tstamp/>
- <javac destdir="${output.dir}" classpathref="project.classpath" debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="on">
- <src path="${src.main.dir}" />
- </javac>
- </target>
-
- <target name="copyclasses" depends="init" description="Copy the classes that were compiled by Eclipse" if="eclipse.running">
- <copy todir="${output.dir}">
- <fileset dir="${classes/main}">
- <include name="**/*.class"/>
- </fileset>
- </copy>
- </target>
-
- <target name="dist" depends="clean,compile,copyclasses" description="Create the application distribution archive">
- <fail unless="project.type">project.type not set</fail>
- <jar jarfile="${dist.dir}/${project.name}.${project.type}">
- <fileset dir="${output.dir}" />
- <fileset dir="${resources.main.dir}">
- <include name="META-INF/**"/>
- <include name="WEB-INF/**" if="project.war" />
- </fileset>
- </jar>
- </target>
-
- <target name="deploy" depends="dist" description="Deploy to JBoss AS">
- <fail unless="project.jboss.home">project.jboss.home not set</fail>
- <delete quiet="true">
- <fileset dir="${deploy.dir}">
- <include name="${project.name}.${project.type}.undeployed"/>
- </fileset>
- </delete>
- <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.${project.type}" />
- </target>
-
- <target name="undeploy" description="Undeploy from JBoss AS">
- <fail unless="project.jboss.home">project.jboss.home not set</fail>
- <fail unless="project.jboss.conf">project.jboss.conf not set</fail>
- <fail unless="project.name">project.name not set</fail>
- <delete>
- <fileset dir="${deploy.dir}">
- <include name="${project.name}.${project.type}*"/>
- </fileset>
- </delete>
- </target>
-
-</project>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-03-16 11:57:34 UTC (rev 15983)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-03-16 12:05:37 UTC (rev 15984)
@@ -31,8 +31,6 @@
<includes>
<include>build-deploy.xml</include>
<include>build-setup.xml</include>
- <include>build-project-gen.xml</include>
- <include>user-project-build.xml</include>
</includes>
</fileSet>
<fileSet>
@@ -122,13 +120,11 @@
<include>java/org/jboss/test/ws/jaxws/smoke/**</include>
<include>java/org/jboss/test/ws/appclient/**</include>
<include>java/org/jboss/test/ws/management/**</include>
- <include>java/org/jboss/test/ws/projectGenerator/**</include>
<include>java/org/jboss/test/ws/saaj/**</include>
<include>resources/jaxrpc/samples/**</include>
<include>resources/jaxws/samples/**</include>
<include>resources/jaxws/smoke/**</include>
<include>resources/management/**</include>
- <include>resources/projectGenerator/**</include>
<include>resources/saaj/**</include>
</includes>
</unpackOptions>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-16 11:57:34 UTC (rev 15983)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-16 12:05:37 UTC (rev 15984)
@@ -62,7 +62,7 @@
<jbossws.api.version>1.0.0.GA</jbossws.api.version>
<jbossws.spi.version>2.0.4-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>2.0.3-SNAPSHOT</jbossws.common.version>
- <jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version>
+ <jbossws.common.tools.version>1.0.1-SNAPSHOT</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.3-SNAPSHOT</jbossws.shared.testsuite.version>
<jboss711.version>7.1.1.Final</jboss711.version> <!-- replace with the EAP6 snapshot version -->
<ejb.api.version>1.0.1.Final</ejb.api.version>
14 years
- 1
- 0
JBossWS SVN: r15983 - in shared-testsuite/branches/jbossws-shared-testsuite-4.0.x: testsuite/src/test/ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-16 07:57:34 -0400 (Fri, 16 Mar 2012)
New Revision: 15983
Removed:
shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/
shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-testsuite.xml
Log:
[JBPAPP-8475][JBWS-3463] removing project generator - svn merge -r 15975:15976 https://svn.jboss.org/repos/jbossws/shared-testsuite/trunk
Property changes on: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x
___________________________________________________________________
Modified: svn:mergeinfo
- /shared-testsuite/branches/asoldano:14040-14045
+ /shared-testsuite/branches/asoldano:14040-14045
/shared-testsuite/trunk:15976
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-testsuite.xml 2012-03-16 11:53:55 UTC (rev 15982)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-testsuite.xml 2012-03-16 11:57:34 UTC (rev 15983)
@@ -594,7 +594,6 @@
<sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/>
<sysproperty key="test.username" value="${test.username}"/>
<sysproperty key="test.password" value="${test.password}"/>
- <sysproperty key="binary.distribution" value="true"/>
<classpath>
<path refid="tests.client.classpath"/>
<pathelement location="${tests.output.dir}/test-classes"/>
@@ -661,7 +660,6 @@
<sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/>
<sysproperty key="test.username" value="${test.username}"/>
<sysproperty key="test.password" value="${test.password"/>
- <sysproperty key="binary.distribution" value="true"/>
<classpath>
<path refid="tests.client.classpath"/>
<pathelement location="${tests.output.dir}/test-classes"/>
@@ -698,32 +696,4 @@
<delete dir="${tests.output.dir}"/>
</target>
- <!-- ================================================================== -->
- <!-- Eclipse conf generation -->
- <!-- ================================================================== -->
-
- <target name="eclipse" depends="tests-jars" description="Generates the JBossWS Testsuite Eclipse project">
- <fail message="Sorry, this target is for src/binary distribution only.">
- <condition>
- <not>
- <isset property="build.dir"/>
- </not>
- </condition>
- </fail>
- <path id="tests.eclipse.classpath">
- <path refid="tests.client.classpath"/>
- <path refid="tests.javac.classpath"/>
- </path>
- <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="ws.stack.classpath"/>
- <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="ws.stack.classpath"/>
- <taskdef name="eclipseJUnitTestGenerator" classname="org.jboss.ws.tools.ant.EclipseJUnitTestsTask" classpathref="ws.stack.classpath"/>
- <eclipseClasspathGenerator pathId="tests.eclipse.classpath" excludesFile="${excludesfile}" srcPath="tests/java"/>
- <eclipseProjectGenerator projectName="JBossWS Testsuite"/>
- <eclipseJUnitTestGenerator projectName="JBossWS Testsuite" projectWorkingDir="${tests.output.dir}" srcDir="${tests.dir}/test-java"
- integrationTarget="${jbossws.integration.target}" endorsedDir="${endorsed.dirs}" jbossHome="${jboss.home}" namingProviderUrl="${node0.jndi.url}"
- securityPolicy="${tests.output.dir}/test-classes/tst.policy" testResourcesDir="${tests.output.dir}/test-resources" testLibsDir="${tests.output.dir}/test-libs">
- <fileset dir="${tests.output.dir}/test-classes" includes="org/jboss/test/ws/**/*TestCase.class" excludes="exclude.wildcard"/>
- </eclipseJUnitTestGenerator>
- </target>
-
</project>
14 years
- 1
- 0
JBossWS SVN: r15982 - in common-tools/branches/jbossws-common-tools-1.0.x: src/main/java/org/jboss/ws/tools/ant and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-16 07:53:55 -0400 (Fri, 16 Mar 2012)
New Revision: 15982
Removed:
common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java
common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java
common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/EclipseProjectTask.java
common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/FixPathTask.java
common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/PathWriterTask.java
Modified:
common-tools/branches/jbossws-common-tools-1.0.x/
Log:
[JBPAPP-8475][JBWS-3463] removing project generator - svn merge -r 15974:15975 https://svn.jboss.org/repos/jbossws/common-tools/trunk
Property changes on: common-tools/branches/jbossws-common-tools-1.0.x
___________________________________________________________________
Added: svn:mergeinfo
+ /common-tools/trunk:15975
Deleted: common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java
===================================================================
--- common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java 2012-03-16 11:45:54 UTC (rev 15981)
+++ common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java 2012-03-16 11:53:55 UTC (rev 15982)
@@ -1,184 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.ant;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.Path;
-
-/**
- * An Ant task creating a simple Eclipse .classpath file using the provided
- * Ant's path id.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 15-Feb-2008
- */
-public class EclipseClasspathTask extends Task
-{
- private String pathId;
- private String excludesFile;
- private String outputFile;
- private String srcPath;
- private String srcOutput;
-
- @Override
- public void execute() throws BuildException
- {
- Project project = getProject();
- Path path = (Path)project.getReference(pathId);
- String[] pathElements = path.list();
- try
- {
- List<String> excludes = getExcludes();
- StringBuffer sb = new StringBuffer();
- generateContent(sb, excludes, pathElements);
- File file = outputFile != null ? new File(outputFile) : new File(getProject().getBaseDir(), ".classpath");
- BufferedWriter out = new BufferedWriter(new FileWriter(file));
- out.write(sb.toString());
- out.close();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- throw new BuildException(e);
- }
- }
-
- private void generateContent(StringBuffer sb, List<String> excludes, String[] libs)
- {
- sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
- sb.append("<classpath>\n");
- sb.append("<classpathentry ");
- if (excludes != null && !excludes.isEmpty())
- {
- sb.append("excluding=\"");
- for (Iterator<String> it = excludes.iterator(); it.hasNext();)
- {
- sb.append(it.next());
- if (it.hasNext())
- sb.append("|");
- }
- sb.append("\" ");
- }
- sb.append("kind=\"src\" ");
- if (srcOutput != null)
- {
- sb.append("output=\"");
- sb.append(srcOutput);
- sb.append("\" ");
- }
- if (srcPath != null)
- {
- sb.append("path=\"");
- sb.append(srcPath);
- sb.append("\" ");
- }
- sb.append("/>\n");
- sb.append("<classpathentry kind=\"con\" path=\"org.eclipse.jdt.launching.JRE_CONTAINER\"/>\n");
- for (int i = 0; i < libs.length; i++)
- {
- if (new File(libs[i]).exists() && libs[i].endsWith(".jar")) //jar files only can be used as lib entry
- {
- sb.append("<classpathentry kind=\"lib\" path=\"");
- sb.append(absoluteToRelativePath(libs[i]));
- sb.append("\"/>\n");
- }
- }
- sb.append("<classpathentry kind=\"output\" path=\"bin\"/>\n");
- sb.append("</classpath>");
- }
-
- private List<String> getExcludes() throws IOException
- {
- List<String> excludes = new LinkedList<String>();
- if (excludesFile != null)
- {
- BufferedReader in = null;
- try
- {
- in = new BufferedReader(new FileReader(excludesFile));
- String str;
- while ((str = in.readLine()) != null)
- {
- if (str.length() > 0 && !str.startsWith("#"))
- excludes.add(str);
- }
- }
- finally
- {
- if (in != null)
- in.close();
- }
- }
- return excludes;
- }
-
- private String absoluteToRelativePath(String absolutePath)
- {
- String baseDir = getProject().getBaseDir().toString();
- String result = absolutePath;
- if (absolutePath.startsWith(baseDir))
- {
- result = absolutePath.substring(baseDir.length());
- if (result.startsWith("\\") || result.startsWith("/"))
- result = result.substring(1);
- }
- return result;
- }
-
- public void setPathId(String pathId)
- {
- this.pathId = pathId;
- }
-
- public void setExcludesFile(String excludesFile)
- {
- this.excludesFile = excludesFile;
- }
-
- public void setOutputFile(String outputFile)
- {
- this.outputFile = outputFile;
- }
-
- public void setSrcPath(String srcPath)
- {
- this.srcPath = srcPath;
- }
-
- public void setSrcOutput(String srcOutput)
- {
- this.srcOutput = srcOutput;
- }
-
-}
Deleted: common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java
===================================================================
--- common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java 2012-03-16 11:45:54 UTC (rev 15981)
+++ common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java 2012-03-16 11:53:55 UTC (rev 15982)
@@ -1,266 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.ant;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.FileSet;
-
-/**
- * An Ant task creating Eclipse's launch configuration files for the JUnit tests
- * of the test-suite.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 18-Feb-2008
- */
-public class EclipseJUnitTestsTask extends Task
-{
- private String projectName;
- private String projectWorkingDir; // the Eclipse project working dir, i.e. the output dir
- private String testResourcesDir; //the dir containing the resources files
- private String testLibsDir; //the dir containing the libs files
- private String srcDir; // the tests src dir
- private String integrationTarget;
- private String jbossHome;
- private String endorsedDir;
- private String namingProviderUrl;
- private String securityPolicy;
- private FileSet fileset;
-
- @Override
- public void execute() throws BuildException
- {
- try
- {
- DirectoryScanner dsc = fileset.getDirectoryScanner(getProject());
- String[] classes = dsc.getIncludedFiles();
- for (int i = 0; i < classes.length; i++)
- {
- String clazz = classes[i];
- File file = new File(getProject().getBaseDir(), pathToClassName(clazz) + ".launch");
- BufferedWriter out = new BufferedWriter(new FileWriter(file));
- out.write(getSingleTestConf(clazz).toString());
- out.close();
- }
- }
- catch (Exception e)
- {
- e.printStackTrace();
- throw new BuildException(e);
- }
- }
-
- public FileSet createFileset()
- {
- this.fileset = new FileSet();
- return fileset;
- }
-
- private static String pathToFullClassName(String path)
- {
- // remove ".class" and replace slashes and backslashes with a dot
- return path.substring(0, path.length() - 6).replaceAll("\\\\", ".").replaceAll("/", ".");
- }
-
- private static String pathToClassName(String path)
- {
- String fullClassName = pathToFullClassName(path);
- return fullClassName.substring(fullClassName.lastIndexOf(".") + 1);
- }
-
- private LaunchConfiguration getSingleTestConf(String clazz)
- {
- LaunchConfiguration conf = new LaunchConfiguration();
- conf.addEntryToListAttribute("org.eclipse.debug.core.MAPPED_RESOURCE_PATHS", "/" + projectName + "/" + absoluteToRelativePath(srcDir) + "/"
- + clazz.substring(0, clazz.length() - 6) + ".java");
- conf.addEntryToListAttribute("org.eclipse.debug.core.MAPPED_RESOURCE_TYPES", "1");
- conf.putBooleanAttribute("org.eclipse.debug.core.appendEnvironmentVariables", true);
- conf.putBooleanAttribute("org.eclipse.jdt.junit.KEEPRUNNING_ATTR", false);
- conf.putStringAttribute("org.eclipse.jdt.junit.CONTAINER", "");
- conf.putStringAttribute("org.eclipse.jdt.junit.TESTNAME", "");
- conf.putStringAttribute("org.eclipse.jdt.junit.TEST_KIND", "org.eclipse.jdt.junit.loader.junit3");
- conf.putStringAttribute("org.eclipse.jdt.launching.MAIN_TYPE", pathToFullClassName(clazz));
- conf.putStringAttribute("org.eclipse.jdt.launching.PROJECT_ATTR", projectName);
- // computing the userDir; please note we get the relative path since we use the Eclipse $workspace_loc variable
- String userDir = "${workspace_loc:" + projectName + "}/" + absoluteToRelativePath(projectWorkingDir);
- String resourcesDir = "${workspace_loc:" + projectName + "}/" + absoluteToRelativePath(testResourcesDir);
- String libsDir = "${workspace_loc:" + projectName + "}/" + absoluteToRelativePath(testLibsDir);
- conf.putStringAttribute("org.eclipse.jdt.launching.VM_ARGUMENTS", getVMArguments(userDir, resourcesDir, libsDir));
- conf.putStringAttribute("org.eclipse.jdt.launching.WORKING_DIRECTORY", userDir);
- return conf;
- }
-
- private String getVMArguments(String userDir, String resourcesDir, String libsDir)
- {
- StringBuffer sb = new StringBuffer();
- sb.append("-Djbossws.integration.target=").append(integrationTarget);
- sb.append(" -ea ");
- sb.append("-Dtest.execution.dir=").append(userDir);
- sb.append(" -Djava.endorsed.dirs=").append(endorsedDir);
- sb.append(" ");
- sb.append("-Djava.naming.provider.url=").append(namingProviderUrl);
- sb.append(" -Djava.protocol.handler.pkgs=org.jboss.virtual.protocol ");
- sb.append("-Djava.security.policy=").append(absoluteToRelativePath(securityPolicy));
- sb.append(" -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory ");
- sb.append("-Duser.dir=").append(userDir);
- sb.append(" -Djboss.home=").append(jbossHome);
- sb.append(" -Djdk.home=${env_var:JAVA_HOME}");
- sb.append(" -Dtest.archive.directory=").append(libsDir);
- sb.append(" -Dtest.resources.directory=").append(resourcesDir);
- sb.append(" -Dbinary.distribution=true");
- return sb.toString();
- }
-
- private String absoluteToRelativePath(String absolutePath)
- {
- String baseDir = getProject().getBaseDir().toString();
- if (!absolutePath.startsWith(baseDir))
- throw new IllegalArgumentException("The provided absolute path is outside the current basedir: " + baseDir);
- return absolutePath.substring(baseDir.length() + 1);
- }
-
- public void setSrcDir(String srcDir)
- {
- this.srcDir = srcDir;
- }
-
- public void setProjectName(String projectName)
- {
- this.projectName = projectName;
- }
-
- public void setProjectWorkingDir(String projectWorkingDir)
- {
- this.projectWorkingDir = projectWorkingDir;
- }
-
- public void setIntegrationTarget(String integrationTarget)
- {
- this.integrationTarget = integrationTarget;
- }
-
- public void setJbossHome(String jbossHome)
- {
- this.jbossHome = jbossHome;
- }
-
- public void setNamingProviderUrl(String namingProviderUrl)
- {
- this.namingProviderUrl = namingProviderUrl;
- }
-
- public void setSecurityPolicy(String securityPolicy)
- {
- this.securityPolicy = securityPolicy;
- }
-
- public void setEndorsedDir(String endorsedDir)
- {
- this.endorsedDir = endorsedDir;
- }
-
- public void setTestResourcesDir(String testResourcesDir)
- {
- this.testResourcesDir = testResourcesDir;
- }
-
- public void setTestLibsDir(String testLibsDir)
- {
- this.testLibsDir = testLibsDir;
- }
-
- private class LaunchConfiguration
- {
- private Map<String, String> booleanAttributes = new LinkedHashMap<String, String>();
- private Map<String, String> stringAttributes = new LinkedHashMap<String, String>();
- private Map<String, List<String>> listAttributes = new LinkedHashMap<String, List<String>>();
-
- public String toString()
- {
- StringBuffer sb = new StringBuffer();
- sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
- sb.append("<launchConfiguration type=\"org.eclipse.jdt.junit.launchconfig\">\n");
- for (String key : listAttributes.keySet())
- {
- sb.append("<listAttribute key=\"").append(key).append("\">\n");
- for (String value : listAttributes.get(key))
- {
- sb.append("<listEntry value=\"").append(value).append("\"/>\n");
- }
- sb.append("</listAttribute>\n");
- }
- for (String key : booleanAttributes.keySet())
- {
- sb.append("<booleanAttribute key=\"").append(key);
- sb.append("\" value=\"").append(booleanAttributes.get(key)).append("\"/>\n");
- }
- for (String key : stringAttributes.keySet())
- {
- sb.append("<stringAttribute key=\"").append(key);
- sb.append("\" value=\"").append(stringAttributes.get(key)).append("\"/>\n");
- }
- sb.append("</launchConfiguration>");
- return sb.toString();
- }
-
- public Map<String, String> getBooleanAttributes()
- {
- return booleanAttributes;
- }
-
- public void putBooleanAttribute(String name, boolean value)
- {
- this.booleanAttributes.put(name, String.valueOf(value));
- }
-
- public Map<String, String> getStringAttributes()
- {
- return stringAttributes;
- }
-
- public void putStringAttribute(String name, String value)
- {
- this.stringAttributes.put(name, value);
- }
-
- public Map<String, List<String>> getListAttributes()
- {
- return listAttributes;
- }
-
- public void addEntryToListAttribute(String attribute, String entryValue)
- {
- if (!listAttributes.containsKey(attribute))
- listAttributes.put(attribute, new LinkedList<String>());
- listAttributes.get(attribute).add(entryValue);
- }
- }
-}
Deleted: common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/EclipseProjectTask.java
===================================================================
--- common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/EclipseProjectTask.java 2012-03-16 11:45:54 UTC (rev 15981)
+++ common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/EclipseProjectTask.java 2012-03-16 11:53:55 UTC (rev 15982)
@@ -1,96 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.ant;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-/**
- * An Ant task creating a simple Eclipse .project file using the provided project name.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 18-Feb-2008
- */
-public class EclipseProjectTask extends Task
-{
- private String projectName;
- private String outputFile;
-
- @Override
- public void execute() throws BuildException
- {
- try
- {
- StringBuffer sb = new StringBuffer();
- generateContent(sb);
- File file;
- if (outputFile != null)
- file = new File(outputFile);
- else
- file = new File(getProject().getBaseDir(), ".project");
- BufferedWriter out = new BufferedWriter(new FileWriter(file));
- out.write(sb.toString());
- out.close();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- throw new BuildException(e);
- }
- }
-
- private void generateContent(StringBuffer sb)
- {
- sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
- sb.append("<projectDescription>\n <name>");
- sb.append(projectName);
- sb.append("</name>\n" +
- " <comment></comment>\n" +
- " <projects>\n" +
- " </projects>\n" +
- " <buildSpec>\n" +
- " <buildCommand>\n" +
- " <name>org.eclipse.jdt.core.javabuilder</name>\n" +
- " <arguments>\n" +
- " </arguments>\n" +
- " </buildCommand>\n" +
- " </buildSpec>\n" +
- " <natures>\n" +
- " <nature>org.eclipse.jdt.core.javanature</nature>\n" +
- " </natures>\n" +
- "</projectDescription>");
- }
-
- public void setProjectName(String projectName)
- {
- this.projectName = projectName;
- }
-
- public void setOutputFile(String outputFile)
- {
- this.outputFile = outputFile;
- }
-}
Deleted: common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/FixPathTask.java
===================================================================
--- common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/FixPathTask.java 2012-03-16 11:45:54 UTC (rev 15981)
+++ common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/FixPathTask.java 2012-03-16 11:53:55 UTC (rev 15982)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.ant;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-public class FixPathTask extends Task
-{
- private String propertyName;
-
- @Override
- public void execute() throws BuildException
- {
- String path = getProject().getProperty(propertyName);
-
- if (path != null)
- {
- getProject().setProperty(propertyName, path.replace('\\', '/'));
- }
- }
-
- public void setProperty(String propertyName)
- {
- this.propertyName = propertyName;
- }
-}
Deleted: common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/PathWriterTask.java
===================================================================
--- common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/PathWriterTask.java 2012-03-16 11:45:54 UTC (rev 15981)
+++ common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/PathWriterTask.java 2012-03-16 11:53:55 UTC (rev 15982)
@@ -1,117 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.ant;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.util.StringTokenizer;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.Path;
-
-/**
- * An Ant task that writes a given path element to a file, so that
- * it can be easily imported by other build files.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 13-Mar-2008
- */
-public class PathWriterTask extends Task
-{
- private String pathId;
- private String outputFile;
- private String variables; //to perform path substitution, i.e. jboss.home <--> /dati/jboss-4.2.3.GA
-
- @Override
- public void execute() throws BuildException
- {
- Project project = getProject();
- Path path = (Path)project.getReference(pathId);
- String[] pathElements = path.list();
- try
- {
- StringBuffer sb = new StringBuffer();
- generateContent(sb, pathElements);
- BufferedWriter out = new BufferedWriter(new FileWriter(new File(outputFile)));
- out.write(sb.toString());
- out.close();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- throw new BuildException(e);
- }
- }
-
- private void generateContent(StringBuffer sb, String[] libs)
- {
- sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
- sb.append("<project>\n");
- sb.append("<path id=\"");
- sb.append(pathId);
- sb.append("\">");
- for (int i = 0; i < libs.length; i++)
- {
- sb.append("<pathelement location=\"");
- sb.append(getPath(libs[i]));
- sb.append("\"/>\n");
- }
- sb.append("</path>");
- sb.append("</project>\n");
- }
-
- private String getPath(String absolutePath)
- {
- StringTokenizer st = new StringTokenizer(variables, ";:, ", false);
- while (st.hasMoreTokens())
- {
- String v = st.nextToken();
- String value = getProject().getProperty(v);
- if (absolutePath.contains(value))
- {
- int begin = absolutePath.indexOf(value);
- int end = begin + value.length();
- absolutePath = absolutePath.substring(0, begin) + "${" + v + "}" + absolutePath.substring(end);
- }
- }
- return absolutePath;
- }
-
- public void setPathId(String pathId)
- {
- this.pathId = pathId;
- }
-
- public void setOutputFile(String outputFile)
- {
- this.outputFile = outputFile;
- }
-
- public void setVariables(String variables)
- {
- this.variables = variables;
- }
-
-}
14 years
- 1
- 0