JBossWS SVN: r19579 - hudson/trunk/hudson-home/jobs/CXF-ALL.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-03-17 12:23:00 -0400 (Tue, 17 Mar 2015)
New Revision: 19579
Modified:
hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
Log:
Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2015-03-17 09:45:27 UTC (rev 19578)
+++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2015-03-17 16:23:00 UTC (rev 19579)
@@ -27,6 +27,14 @@
, CXF-CORE-AS-8.2.0-SECMGR
, CXF-CORE-AS-9.0.0-SECMGR
+
+, CXF-CORE-AS-8.0.0-IPV6
+
+, CXF-CORE-AS-8.1.0-IPV6
+
+, CXF-CORE-AS-8.2.0-IPV6
+
+, CXF-CORE-AS-9.0.0-IPV6
</childProjects>
<threshold>
<name>UNSTABLE</name>
9 years, 4 months
JBossWS SVN: r19578 - in stack/cxf/branches/management/modules: server/src/main/java/org/jboss/wsf/stack/cxf/interceptor and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2015-03-17 05:45:27 -0400 (Tue, 17 Mar 2015)
New Revision: 19578
Added:
stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointMetricsGetInterceptor.java
stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointMetricsGetOutInterceptor.java
Modified:
stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/branches/management/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java
Log:
[JBWS-3881]:Add interceptor to query endpoint metrics
Modified: stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2015-03-16 16:47:51 UTC (rev 19577)
+++ stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2015-03-17 09:45:27 UTC (rev 19578)
@@ -73,6 +73,7 @@
import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor;
import org.jboss.wsf.stack.cxf.interceptor.EndpointConfigsGetInterceptor;
import org.jboss.wsf.stack.cxf.interceptor.EndpointConfigsPutInterceptor;
+import org.jboss.wsf.stack.cxf.interceptor.EndpointMetricsGetInterceptor;
import org.jboss.wsf.stack.cxf.interceptor.HandlerAuthInterceptor;
import org.jboss.wsf.stack.cxf.interceptor.NsCtxSelectorStoreInterceptor;
import org.jboss.wsf.stack.cxf.interceptor.WSDLSoapAddressRewriteInterceptor;
@@ -208,6 +209,7 @@
bus.getInInterceptors().add(new EnableDecoupledFaultInterceptor());
bus.getInInterceptors().add(new EndpointConfigsGetInterceptor());
bus.getInInterceptors().add(new EndpointConfigsPutInterceptor());
+ bus.getInInterceptors().add(new EndpointMetricsGetInterceptor());
bus.getInInterceptors().add(new NsCtxSelectorStoreInterceptor());
final String p = (props != null) ? props.get(Constants.JBWS_CXF_DISABLE_HANDLER_AUTH_CHECKS) : null;
Added: stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointMetricsGetInterceptor.java
===================================================================
--- stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointMetricsGetInterceptor.java (rev 0)
+++ stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointMetricsGetInterceptor.java 2015-03-17 09:45:27 UTC (rev 19578)
@@ -0,0 +1,111 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2015, 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.wsf.stack.cxf.interceptor;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.cxf.binding.soap.interceptor.EndpointSelectionInterceptor;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.interceptor.OutgoingChainInterceptor;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.Phase;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.management.EndpointMetrics;
+
+/**
+ * Interceptor to get json format endpoint metrics. This interceptor is only
+ * responds to get url like http://localhost:8080/context/wsendpoint/management?metrics
+ *@author <a href="mailto:ema@redhat.com>Jim Ma</a>
+ *
+ */
+public class EndpointMetricsGetInterceptor extends AbstractEndpintManagementInterceptor
+{
+ public static final EndpointMetricsGetInterceptor INSTANCE = new EndpointMetricsGetInterceptor();
+ public static final String ENDPOINT_METRICS = EndpointMetricsGetInterceptor.class.getName() + ".EndpointMetrics";
+ public static final Set<String> httpMethods = new HashSet<String>(4);
+ private Interceptor<Message> metricsOutInteceptor = EndpointMetricsGetOutInterceptor.INSTANCE;
+ private static final String TRANSFORM_SKIP = "transform.skip";
+ static
+ {
+ httpMethods.add("GET");
+ httpMethods.add("POST");
+ }
+
+ public EndpointMetricsGetInterceptor()
+ {
+ super(Phase.READ);
+ getAfter().add(EndpointSelectionInterceptor.class.getName());
+ }
+
+ public EndpointMetricsGetInterceptor(Interceptor<Message> outInterceptor)
+ {
+ this();
+ // Let people override the EndpointConfigsGetOutIntercetpor
+ //configsOutInteceptor = outInterceptor;
+ }
+
+ public void handleMessage(Message message) throws Fault
+ {
+ if (!isAllowed(message))
+ {
+ return;
+ }
+ if (isRecognizedQuery(getQueryMap(message)))
+ {
+
+ Endpoint endpoint = message.getExchange().get(Endpoint.class);
+ EndpointMetrics endpointMetrics = endpoint.getEndpointMetrics();
+ if (endpointMetrics == null) {
+ return;
+ }
+ Message mout = this.createOutMessage(message);
+ mout.put(ENDPOINT_METRICS, endpointMetrics);
+ mout.put(Message.CONTENT_TYPE, "text/xml");
+ // just remove the interceptor which should not be used
+ cleanUpOutInterceptors(mout);
+ // notice this is being added after the purge above, don't swap the order!
+
+ mout.getInterceptorChain().add(metricsOutInteceptor);
+ message.getExchange().put(TRANSFORM_SKIP, Boolean.TRUE);
+ // skip the service executor and goto the end of the chain.
+ message.getInterceptorChain().doInterceptStartingAt(message, OutgoingChainInterceptor.class.getName());
+ }
+ }
+
+ private boolean isRecognizedQuery(Map<String, String> map)
+ {
+ if (map.containsKey("metrics") && map.size() == 1) {
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ Set<String> getAllowedMethod()
+ {
+ return httpMethods;
+ }
+
+}
Property changes on: stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointMetricsGetInterceptor.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointMetricsGetOutInterceptor.java
===================================================================
--- stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointMetricsGetOutInterceptor.java (rev 0)
+++ stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointMetricsGetOutInterceptor.java 2015-03-17 09:45:27 UTC (rev 19578)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2015, 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.wsf.stack.cxf.interceptor;
+
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.StaxOutInterceptor;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.staxutils.StaxUtils;
+import org.codehaus.jettison.AbstractXMLStreamWriter;
+import org.codehaus.jettison.mapped.MappedNamespaceConvention;
+import org.codehaus.jettison.mapped.MappedXMLStreamWriter;
+import org.jboss.wsf.spi.management.EndpointMetrics;
+
+/**
+ * Out Interceptor to write json format endpoint metrics result. This interceptor is added to interceptorchain by
+ * @see org.jboss.wsf.stack.cxf.interceptor.EndpointMetricsGetInterceptor
+ * @author <a href="mailto:ema@redhat.com">Jim Ma</a>
+ *
+ */
+public class EndpointMetricsGetOutInterceptor extends AbstractPhaseInterceptor<Message>
+{
+ public static final EndpointMetricsGetOutInterceptor INSTANCE = new EndpointMetricsGetOutInterceptor();
+
+ public EndpointMetricsGetOutInterceptor()
+ {
+ super(Phase.PRE_STREAM);
+ getAfter().add(StaxOutInterceptor.class.getName());
+ }
+
+ public void handleMessage(Message message) throws Fault
+ {
+ EndpointMetrics metrics = (EndpointMetrics)message.get(EndpointMetricsGetInterceptor.ENDPOINT_METRICS);
+ message.remove(EndpointMetricsGetInterceptor.ENDPOINT_METRICS);
+ OutputStream out = message.getContent(OutputStream.class);
+ if (out == null)
+ {
+ return;
+ }
+ message.put(Message.CONTENT_TYPE, "text/xml");
+ OutputStreamWriter writer = null;
+ AbstractXMLStreamWriter mappedWriter = null;
+ try
+ {
+ writer = new OutputStreamWriter(out, getEncoding(message));
+ mappedWriter = new MappedXMLStreamWriter(new MappedNamespaceConvention(), writer);
+ mappedWriter.writeStartDocument();
+ writeElement(mappedWriter, "requestCount", metrics.getRequestCount());
+ writeElement(mappedWriter, "responseCount", metrics.getResponseCount());
+ writeElement(mappedWriter, "faultCount", metrics.getFaultCount());
+ writeElement(mappedWriter, "totalProcessingTime", metrics.getTotalProcessingTime());
+ writeElement(mappedWriter, "maxProcessingTime", metrics.getMaxProcessingTime());
+ writeElement(mappedWriter, "minProcessingTime", metrics.getMinProcessingTime());
+ writeElement(mappedWriter, "averageProcessingTime", metrics.getAverageProcessingTime());
+ mappedWriter.writeEndDocument();
+ out.flush();
+ }
+ catch (Exception e)
+ {
+ throw new Fault(e);
+ }
+ finally
+ {
+ StaxUtils.close(mappedWriter);
+ }
+ }
+
+ private void writeElement(AbstractXMLStreamWriter writter, String key, long value) throws Exception
+ {
+ writter.writeStartElement(key);
+ writter.writeCharacters(String.valueOf(value));
+ writter.writeEndElement();
+
+ }
+ private String getEncoding(Message message)
+ {
+ Exchange ex = message.getExchange();
+ String encoding = (String)message.get(Message.ENCODING);
+ if (encoding == null && ex.getInMessage() != null)
+ {
+ encoding = (String)ex.getInMessage().get(Message.ENCODING);
+ message.put(Message.ENCODING, encoding);
+ }
+
+ if (encoding == null)
+ {
+ encoding = "UTF-8";
+ message.put(Message.ENCODING, encoding);
+ }
+ return encoding;
+ }
+
+}
Property changes on: stack/cxf/branches/management/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointMetricsGetOutInterceptor.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: stack/cxf/branches/management/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java
===================================================================
--- stack/cxf/branches/management/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2015-03-16 16:47:51 UTC (rev 19577)
+++ stack/cxf/branches/management/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2015-03-17 09:45:27 UTC (rev 19578)
@@ -137,7 +137,7 @@
ByteArrayOutputStream bout = new ByteArrayOutputStream();
IOUtils.copy(connenction.getInputStream(), bout);
assertTrue("Unexpected response", bout.toString().contains("\"type\":\"JAXWS_JSE\",\"securityDomain\":\"JBossWS\""));
-
+ //enable statistics
url = new URL(baseURL + "/jaxws-samples-context-jse/management?statistics-enabled=true");
connenction = (HttpURLConnection)url.openConnection();
connenction.setRequestProperty("Authorization", "Basic " + encoding);
@@ -146,6 +146,18 @@
bout = new ByteArrayOutputStream();
IOUtils.copy(connenction.getInputStream(), bout);
assertTrue("Unexpected response", bout.toString().contains("Successfully set endpoint runtime configurations"));
+ //call webservice
+ port.testMessageContextProperties();
+ //get metrics
+ url = new URL(baseURL + "/jaxws-samples-context-jse/management?metrics");
+ connenction = (HttpURLConnection)url.openConnection();
+ connenction.setRequestProperty("Authorization", "Basic " + encoding);
+ connenction.connect();
+ assertEquals(200, connenction.getResponseCode());
+ bout = new ByteArrayOutputStream();
+ IOUtils.copy(connenction.getInputStream(), bout);
+ assertTrue("Unexpected response", bout.toString().contains("\"requestCount\":3"));
+
}
}
9 years, 4 months
JBossWS SVN: r19577 - in hudson/trunk/hudson-home: jobs/CXF-CORE-AS-8.0.0-IPV6 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-03-16 12:47:51 -0400 (Mon, 16 Mar 2015)
New Revision: 19577
Modified:
hudson/trunk/hudson-home/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-IPV6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-IPV6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-IPV6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-IPV6/config.xml
Log:
Fixing TEST_OPTS to use latest additions...
Modified: hudson/trunk/hudson-home/config.xml
===================================================================
--- hudson/trunk/hudson-home/config.xml 2015-03-16 16:10:15 UTC (rev 19576)
+++ hudson/trunk/hudson-home/config.xml 2015-03-16 16:47:51 UTC (rev 19577)
@@ -81,9 +81,12 @@
<string>CXF-CORE-AS-8.1.0</string>
<string>CXF-CORE-AS-8.2.0</string>
<string>CXF-CORE-AS-8.1.0-SECMGR</string>
+ <string>CXF-CORE-AS-8.1.0-IPV6</string>
<string>CXF-CORE-AS-8.2.0-SECMGR</string>
+ <string>CXF-CORE-AS-8.2.0-IPV6</string>
<string>CXF-CORE-AS-9.0.0</string>
<string>CXF-CORE-AS-9.0.0-SECMGR</string>
+ <string>CXF-CORE-AS-9.0.0-IPV6</string>
<string>CXF-CORE-AS-8.0.0-SPRING</string>
<string>CXF-CORE-AS-8.1.0-SPRING</string>
<string>CXF-CORE-AS-8.2.0-SPRING</string>
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-IPV6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-IPV6/config.xml 2015-03-16 16:10:15 UTC (rev 19576)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-IPV6/config.xml 2015-03-16 16:47:51 UTC (rev 19577)
@@ -13,7 +13,7 @@
JAVA_HOME=(a)java.home.sun.jdk6@
SCRIPTS_DIR=$WORKSPACE/hudson-scripts
STACK_DIR=$WORKSPACE/stack-cxf
-TEST_OPTS="-Djboss.bind.address=[::1] -DadditionalJvmArgs=\"-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true\" -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true"
+TEST_OPTS="-Djboss.bind.address=[::1] -Dipv6"
JBOSS_TARGET=wildfly800
#
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-IPV6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-IPV6/config.xml 2015-03-16 16:10:15 UTC (rev 19576)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-IPV6/config.xml 2015-03-16 16:47:51 UTC (rev 19577)
@@ -13,7 +13,7 @@
JAVA_HOME=(a)java.home.sun.jdk6@
SCRIPTS_DIR=$WORKSPACE/hudson-scripts
STACK_DIR=$WORKSPACE/stack-cxf
-TEST_OPTS="-Djboss.bind.address=[::1] -DadditionalJvmArgs=\"-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true\" -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true"
+TEST_OPTS="-Djboss.bind.address=[::1] -Dipv6"
JBOSS_TARGET=wildfly810
#
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-IPV6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-IPV6/config.xml 2015-03-16 16:10:15 UTC (rev 19576)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-IPV6/config.xml 2015-03-16 16:47:51 UTC (rev 19577)
@@ -13,7 +13,7 @@
JAVA_HOME=(a)java.home.sun.jdk6@
SCRIPTS_DIR=$WORKSPACE/hudson-scripts
STACK_DIR=$WORKSPACE/stack-cxf
-TEST_OPTS="-Djboss.bind.address=[::1] -DadditionalJvmArgs=\"-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true\" -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true"
+TEST_OPTS="-Djboss.bind.address=[::1] -Dipv6"
JBOSS_TARGET=wildfly820
#
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-IPV6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-IPV6/config.xml 2015-03-16 16:10:15 UTC (rev 19576)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-IPV6/config.xml 2015-03-16 16:47:51 UTC (rev 19577)
@@ -13,7 +13,7 @@
JAVA_HOME=(a)java.home.sun.jdk6@
SCRIPTS_DIR=$WORKSPACE/hudson-scripts
STACK_DIR=$WORKSPACE/stack-cxf
-TEST_OPTS="-Djboss.bind.address=[::1] -DadditionalJvmArgs=\"-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true\" -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true"
+TEST_OPTS="-Djboss.bind.address=[::1] -Dipv6"
JBOSS_TARGET=wildfly900
JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@
9 years, 4 months
JBossWS SVN: r19576 - hudson/trunk/scripts.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-03-16 12:10:15 -0400 (Mon, 16 Mar 2015)
New Revision: 19576
Modified:
hudson/trunk/scripts/jbossws-qa.sh
Log:
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2015-03-16 14:22:32 UTC (rev 19575)
+++ hudson/trunk/scripts/jbossws-qa.sh 2015-03-16 16:10:15 UTC (rev 19576)
@@ -53,7 +53,7 @@
runTestsViaMaven() {
echo "TEST_OPTS: $TEST_OPTS"
- mvn $ENVIRONMENT -Phudson,$JBOSS_TARGET "$TEST_OPTS" integration-test 2>&1 | tee $WORKSPACE/tests.log
+ mvn $ENVIRONMENT -Phudson,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log
}
coreTestWithSpring() {
9 years, 4 months
JBossWS SVN: r19575 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-03-16 10:22:32 -0400 (Mon, 16 Mar 2015)
New Revision: 19575
Modified:
stack/cxf/trunk/README
Log:
[JBWS-3886] Updating README
Modified: stack/cxf/trunk/README
===================================================================
--- stack/cxf/trunk/README 2015-03-16 14:20:35 UTC (rev 19574)
+++ stack/cxf/trunk/README 2015-03-16 14:22:32 UTC (rev 19575)
@@ -13,6 +13,7 @@
The '-Dnoprepare' option can be used to avoid integration tests preparation phase, which includes tuning of the server configurations, wsconsume/wsprovide invocations, etc.
The '-Ddebug' option can be used to turn on surefire debugging of integration tests only.
The '-Djboss.bind.address=x.y.w.z' option can be used to have the started containers bound to the specified network interface address.
+The '-Dipv6' option can be used to run the integration testsuite using IPv6 protocol.
The '-Darquillian.deploymentExportPath=target/foo' option can be used to have Arquillian write the actual test deployments to disk.
The 'fast' profile can also be used to run tests concurrently; run 'mvn -Pfast,wildflyXYZ post-integration-test' in such case to trigger test servers' shutdown and save memory at the end of each testsuite module.
9 years, 4 months
JBossWS SVN: r19574 - in stack/cxf/trunk: modules/testsuite and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-03-16 10:20:35 -0400 (Mon, 16 Mar 2015)
New Revision: 19574
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3886] Add option for easily testing with IPv6
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2015-03-16 11:16:54 UTC (rev 19573)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2015-03-16 14:20:35 UTC (rev 19574)
@@ -284,7 +284,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} ${ipVerArgs} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
<skip>true</skip>
<failIfNoTests>false</failIfNoTests>
<runOrder>alphabetical</runOrder>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2015-03-16 11:16:54 UTC (rev 19573)
+++ stack/cxf/trunk/pom.xml 2015-03-16 14:20:35 UTC (rev 19574)
@@ -1363,6 +1363,28 @@
<!-- Profiles -->
<profiles>
+ <profile>
+ <id>ipv6</id>
+ <activation>
+ <property>
+ <name>ipv6</name>
+ </property>
+ </activation>
+ <properties>
+ <ipVerArgs>-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true</ipVerArgs>
+ </properties>
+ </profile>
+ <profile>
+ <id>ipv4</id>
+ <activation>
+ <property>
+ <name>!ipv6</name>
+ </property>
+ </activation>
+ <properties>
+ <ipVerArgs>-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false</ipVerArgs>
+ </properties>
+ </profile>
<!--
Name: wildfly800
@@ -1374,7 +1396,7 @@
<jbossws.integration.target>wildfly800</jbossws.integration.target>
<jboss.home>${server.home}</jboss.home>
<jboss.version>${wildfly800.version}</jboss.version>
- <additionalJvmArgs>-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</additionalJvmArgs>
+ <additionalJvmArgs>-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl ${ipVerArgs}</additionalJvmArgs>
</properties>
<modules>
<module>modules/dist</module>
@@ -1392,7 +1414,7 @@
<jbossws.integration.target>wildfly810</jbossws.integration.target>
<jboss.home>${server.home}</jboss.home>
<jboss.version>${wildfly810.version}</jboss.version>
- <additionalJvmArgs>-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</additionalJvmArgs>
+ <additionalJvmArgs>-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl ${ipVerArgs}</additionalJvmArgs>
</properties>
<modules>
<module>modules/dist</module>
@@ -1410,7 +1432,7 @@
<jbossws.integration.target>wildfly820</jbossws.integration.target>
<jboss.home>${server.home}</jboss.home>
<jboss.version>${wildfly820.version}</jboss.version>
- <additionalJvmArgs>-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</additionalJvmArgs>
+ <additionalJvmArgs>-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl ${ipVerArgs}</additionalJvmArgs>
</properties>
<modules>
<module>modules/dist</module>
@@ -1428,7 +1450,7 @@
<jbossws.integration.target>wildfly900</jbossws.integration.target>
<jboss.home>${server.home}</jboss.home>
<jboss.version>${wildfly900.version}</jboss.version>
- <additionalJvmArgs></additionalJvmArgs>
+ <additionalJvmArgs>${ipVerArgs}</additionalJvmArgs>
</properties>
<modules>
<module>modules/dist</module>
9 years, 4 months
JBossWS SVN: r19573 - hudson/trunk/scripts.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-03-16 07:16:54 -0400 (Mon, 16 Mar 2015)
New Revision: 19573
Modified:
hudson/trunk/scripts/jbossws-qa.sh
Log:
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2015-03-16 10:02:08 UTC (rev 19572)
+++ hudson/trunk/scripts/jbossws-qa.sh 2015-03-16 11:16:54 UTC (rev 19573)
@@ -52,7 +52,8 @@
}
runTestsViaMaven() {
- mvn $ENVIRONMENT -Phudson,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log
+ echo "TEST_OPTS: $TEST_OPTS"
+ mvn $ENVIRONMENT -Phudson,$JBOSS_TARGET "$TEST_OPTS" integration-test 2>&1 | tee $WORKSPACE/tests.log
}
coreTestWithSpring() {
9 years, 4 months
JBossWS SVN: r19572 - in hudson/trunk/hudson-home/jobs: CXF-CORE-AS-8.0.0-IPV6 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-03-16 06:02:08 -0400 (Mon, 16 Mar 2015)
New Revision: 19572
Added:
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-IPV6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-IPV6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-IPV6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-IPV6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-IPV6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-IPV6/config.xml
Modified:
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-IPV6/config.xml
Log:
More IPv6 jobs.More IPv6 jobs...
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-IPV6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-IPV6/config.xml 2015-03-16 09:56:49 UTC (rev 19571)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-IPV6/config.xml 2015-03-16 10:02:08 UTC (rev 19572)
@@ -13,9 +13,8 @@
JAVA_HOME=(a)java.home.sun.jdk6@
SCRIPTS_DIR=$WORKSPACE/hudson-scripts
STACK_DIR=$WORKSPACE/stack-cxf
-TEST_OPTS=-Djboss.bind.address=[::1] -DadditionalJvmArgs="-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true" -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true
+TEST_OPTS="-Djboss.bind.address=[::1] -DadditionalJvmArgs=\"-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true\" -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true"
JBOSS_TARGET=wildfly800
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0-SECMGR/workspace/build/target/(a)hudson.jboss800.build@
#
# load test functions
Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-IPV6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-IPV6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-IPV6/config.xml 2015-03-16 10:02:08 UTC (rev 19572)
@@ -0,0 +1,72 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-CORE-AS-8.1.0-IPV6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS="-Djboss.bind.address=[::1] -DadditionalJvmArgs=\"-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true\" -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true"
+JBOSS_TARGET=wildfly810
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss810.build@ with IPv6</description>
+ <actions class="vector"/>
+</project>
Property changes on: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-IPV6/config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-IPV6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-IPV6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-IPV6/config.xml 2015-03-16 10:02:08 UTC (rev 19572)
@@ -0,0 +1,72 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-CORE-AS-8.2.0-IPV6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS="-Djboss.bind.address=[::1] -DadditionalJvmArgs=\"-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true\" -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true"
+JBOSS_TARGET=wildfly820
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss820.build@ with IPv6</description>
+ <actions class="vector"/>
+</project>
Property changes on: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-IPV6/config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-IPV6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-IPV6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-IPV6/config.xml 2015-03-16 10:02:08 UTC (rev 19572)
@@ -0,0 +1,73 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-CORE-AS-9.0.0-IPV6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS="-Djboss.bind.address=[::1] -DadditionalJvmArgs=\"-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true\" -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true"
+JBOSS_TARGET=wildfly900
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss900.build@ with IPv6</description>
+ <actions class="vector"/>
+</project>
Property changes on: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-IPV6/config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
9 years, 4 months
JBossWS SVN: r19571 - in common/branches/management/src: main/java/org/jboss/ws/common/management and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2015-03-16 05:56:49 -0400 (Mon, 16 Mar 2015)
New Revision: 19571
Modified:
common/branches/management/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java
common/branches/management/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java
common/branches/management/src/main/java/org/jboss/ws/common/deployment/DefaultService.java
common/branches/management/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
common/branches/management/src/test/java/org/jboss/test/ws/common/management/DefaultEndpointRegistryTestCase.java
Log:
[JBWS-3880]:Add more apis to RuntimeConfig interface
Modified: common/branches/management/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java
===================================================================
--- common/branches/management/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java 2015-03-16 09:56:14 UTC (rev 19570)
+++ common/branches/management/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java 2015-03-16 09:56:49 UTC (rev 19571)
@@ -22,9 +22,11 @@
package org.jboss.ws.common.deployment;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.management.MalformedObjectNameException;
@@ -41,6 +43,7 @@
import org.jboss.wsf.spi.deployment.EndpointType;
import org.jboss.wsf.spi.deployment.InstanceProvider;
import org.jboss.wsf.spi.deployment.LifecycleHandler;
+import org.jboss.wsf.spi.deployment.RuntimeConfig;
import org.jboss.wsf.spi.deployment.Service;
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
import org.jboss.wsf.spi.invocation.InvocationHandler;
@@ -60,6 +63,7 @@
*/
public class AbstractDefaultEndpoint extends AbstractExtensible
{
+ private static final Set<String> RUNTIME_CONFIG_FLAGS = new HashSet<String>();
protected volatile Service service;
protected volatile ObjectName name;
protected volatile String shortName;
@@ -78,6 +82,9 @@
protected volatile InstanceProvider instanceProvider;
protected volatile EndpointConfig endpointConfig;
protected Map<String, String> configsMap = new HashMap<String, String>(64);
+ static {
+ RUNTIME_CONFIG_FLAGS.add(RuntimeConfig.STATISTICS_ENABLED);
+ }
AbstractDefaultEndpoint(String targetBean)
{
@@ -368,4 +375,10 @@
configsMap.putAll(this.getRuntimeProperties());
return configsMap;
}
+
+ @Override
+ public Set<String> getRuntimeConfigFlags()
+ {
+ return RUNTIME_CONFIG_FLAGS;
+ }
}
Modified: common/branches/management/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java
===================================================================
--- common/branches/management/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java 2015-03-16 09:56:14 UTC (rev 19570)
+++ common/branches/management/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java 2015-03-16 09:56:49 UTC (rev 19571)
@@ -21,8 +21,12 @@
*/
package org.jboss.ws.common.deployment;
+import java.util.HashSet;
+import java.util.Set;
+
import org.jboss.wsf.spi.deployment.AbstractExtensible;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.RuntimeConfig;
import org.jboss.wsf.spi.deployment.Service;
/**
@@ -34,14 +38,17 @@
* @since 20-Apr-2007
*/
public class DefaultDeployment extends AbstractExtensible implements Deployment
-{
+{
+ private static final Set<String> RUNTIME_CONFIG_FLAGS = new HashSet<String>();
// The name for this deployment
private final String simpleName;
// A deployment has one service
private final Service service;
// The runtime class loader
private final ClassLoader classLoader;
-
+ static {
+ RUNTIME_CONFIG_FLAGS.add(RuntimeConfig.STATISTICS_ENABLED);
+ }
DefaultDeployment(String name, ClassLoader classLoader)
{
super(12, 4);
@@ -64,4 +71,10 @@
{
return service;
}
+
+ @Override
+ public Set<String> getRuntimeConfigFlags()
+ {
+ return RUNTIME_CONFIG_FLAGS;
+ }
}
Modified: common/branches/management/src/main/java/org/jboss/ws/common/deployment/DefaultService.java
===================================================================
--- common/branches/management/src/main/java/org/jboss/ws/common/deployment/DefaultService.java 2015-03-16 09:56:14 UTC (rev 19570)
+++ common/branches/management/src/main/java/org/jboss/ws/common/deployment/DefaultService.java 2015-03-16 09:56:49 UTC (rev 19571)
@@ -30,6 +30,7 @@
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
/**
@@ -125,4 +126,10 @@
this.virtualHost = virtualHost;
}
+ @Override
+ public Set<String> getRuntimeConfigFlags()
+ {
+ return dep.getRuntimeConfigFlags();
+ }
+
}
Modified: common/branches/management/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
===================================================================
--- common/branches/management/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2015-03-16 09:56:14 UTC (rev 19570)
+++ common/branches/management/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2015-03-16 09:56:49 UTC (rev 19571)
@@ -29,6 +29,8 @@
import java.security.AccessController;
import java.security.Permission;
import java.security.PrivilegedAction;
+import java.util.HashSet;
+import java.util.Set;
import javax.management.MBeanServer;
@@ -37,6 +39,7 @@
import org.jboss.wsf.spi.WSFException;
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.deployment.AbstractExtensible;
+import org.jboss.wsf.spi.deployment.RuntimeConfig;
import org.jboss.wsf.spi.management.CommonConfigStore;
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.StackConfig;
@@ -63,6 +66,7 @@
*/
public abstract class AbstractServerConfig extends AbstractExtensible implements AbstractServerConfigMBean, ServerConfig
{
+ private static final Set<String> RUNTIME_CONFIG_FLAGS = new HashSet<String>();
private static final RuntimePermission LOOKUP_SERVER_INTEGRATION_SERVER_CONFIG = new RuntimePermission("org.jboss.ws.LOOKUP_SERVER_INTEGRATION_SERVER_CONFIG");
// The MBeanServer
@@ -103,6 +107,9 @@
// The server integration classloader' ServerConfig instance reference
private static volatile ServerConfig serverConfig;
+ static {
+ RUNTIME_CONFIG_FLAGS.add(RuntimeConfig.STATISTICS_ENABLED);
+ }
public MBeanServer getMbeanServer()
{
return mbeanServer;
@@ -451,4 +458,9 @@
public interface UpdateCallbackHandler {
public void onBeforeUpdate();
}
+ @Override
+ public Set<String> getRuntimeConfigFlags()
+ {
+ return RUNTIME_CONFIG_FLAGS;
+ }
}
Modified: common/branches/management/src/test/java/org/jboss/test/ws/common/management/DefaultEndpointRegistryTestCase.java
===================================================================
--- common/branches/management/src/test/java/org/jboss/test/ws/common/management/DefaultEndpointRegistryTestCase.java 2015-03-16 09:56:14 UTC (rev 19570)
+++ common/branches/management/src/test/java/org/jboss/test/ws/common/management/DefaultEndpointRegistryTestCase.java 2015-03-16 09:56:49 UTC (rev 19571)
@@ -441,6 +441,13 @@
// TODO Auto-generated method stub
return null;
}
+
+ @Override
+ public Set<String> getRuntimeConfigFlags()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
};
}
}
9 years, 4 months
JBossWS SVN: r19570 - in spi/branches/management/src/main/java/org/jboss/wsf/spi: invocation and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2015-03-16 05:56:14 -0400 (Mon, 16 Mar 2015)
New Revision: 19570
Modified:
spi/branches/management/src/main/java/org/jboss/wsf/spi/deployment/RuntimeConfig.java
spi/branches/management/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java
Log:
[JBWS-3880]:Add more apis to RuntimeConfig interface
Modified: spi/branches/management/src/main/java/org/jboss/wsf/spi/deployment/RuntimeConfig.java
===================================================================
--- spi/branches/management/src/main/java/org/jboss/wsf/spi/deployment/RuntimeConfig.java 2015-03-16 09:53:57 UTC (rev 19569)
+++ spi/branches/management/src/main/java/org/jboss/wsf/spi/deployment/RuntimeConfig.java 2015-03-16 09:56:14 UTC (rev 19570)
@@ -22,23 +22,29 @@
package org.jboss.wsf.spi.deployment;
import java.util.Map;
+import java.util.Set;
+
/**
* Runtime config interface to allow change various property in runtime
* @author <a href="mailto:ema@redhat.com">Jim Ma</a>
*
*/
-public interface RuntimeConfig {
- static final String STATISTICS_ENABLED = "statistics-enabled";
- /** Get runtime changeable property */
- String getRuntimeProperty(String key);
+public interface RuntimeConfig
+{
+ static final String STATISTICS_ENABLED = "statistics-enabled";
- /** Set runtime changeable property */
- void setRuntimeProperty(String key, String value);
+ /** Get runtime changeable property */
+ String getRuntimeProperty(String key);
- /** Remove a runtime changeable property */
- void removeRuntimeProperty(String key);
+ /** Set runtime changeable property */
+ void setRuntimeProperty(String key, String value);
- /** Get the set of runtime changeable property names */
- Map<String, String> getRuntimeProperties();
+ /** Remove a runtime changeable property */
+ void removeRuntimeProperty(String key);
+ /** Get the set of runtime changeable property names */
+ Map<String, String> getRuntimeProperties();
+ /** Get the runtime config name set that can be get/set*/
+ Set<String> getRuntimeConfigFlags();
+
}
Modified: spi/branches/management/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java
===================================================================
--- spi/branches/management/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java 2015-03-16 09:53:57 UTC (rev 19569)
+++ spi/branches/management/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java 2015-03-16 09:56:14 UTC (rev 19570)
@@ -21,6 +21,8 @@
*/
package org.jboss.wsf.spi.invocation;
+import java.util.Set;
+
import org.jboss.wsf.spi.deployment.AbstractExtensible;
/**
@@ -47,4 +49,11 @@
this.targetBean = targetBean;
}
+
+ public Set<String> getRuntimeConfigFlags()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
9 years, 4 months