cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1229778 - in /cxf/trunk/rt/management: pom.xml src/main/build-resources/ src/main/build-resources/instrumentation.xjb src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
Date Tue, 10 Jan 2012 22:45:41 GMT
Author: dkulp
Date: Tue Jan 10 22:45:40 2012
New Revision: 1229778

URL: http://svn.apache.org/viewvc?rev=1229778&view=rev
Log:
CHange generated package name to not conflict with rt-core stuff

Added:
    cxf/trunk/rt/management/src/main/build-resources/
    cxf/trunk/rt/management/src/main/build-resources/instrumentation.xjb   (with props)
Modified:
    cxf/trunk/rt/management/pom.xml
    cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java

Modified: cxf/trunk/rt/management/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/pom.xml?rev=1229778&r1=1229777&r2=1229778&view=diff
==============================================================================
--- cxf/trunk/rt/management/pom.xml (original)
+++ cxf/trunk/rt/management/pom.xml Tue Jan 10 22:45:40 2012
@@ -94,6 +94,7 @@
                                 <xsdOption>
                                     <xsd>${basedir}/src/main/resources/schemas/configuration/instrumentation.xsd</xsd>
                                     <extension>true</extension>
+                                    <bindingFile>${basedir}/src/main/build-resources/instrumentation.xjb</bindingFile>
                                     <extensionArgs>
                                         <extensionArg>-Xdv</extensionArg>
                                     </extensionArgs>

Added: cxf/trunk/rt/management/src/main/build-resources/instrumentation.xjb
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/main/build-resources/instrumentation.xjb?rev=1229778&view=auto
==============================================================================
--- cxf/trunk/rt/management/src/main/build-resources/instrumentation.xjb (added)
+++ cxf/trunk/rt/management/src/main/build-resources/instrumentation.xjb Tue Jan 10 22:45:40
2012
@@ -0,0 +1,27 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<jxb:bindings jxb:version="1.0"
+	      xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+	      xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <jxb:bindings schemaLocation="../resources/schemas/configuration/instrumentation.xsd"
node="/xsd:schema">
+	<jxb:schemaBindings>
+	    <jxb:package name="org.apache.cxf.management.jmx.type"/>
+	</jxb:schemaBindings>
+    </jxb:bindings>
+</jxb:bindings>

Propchange: cxf/trunk/rt/management/src/main/build-resources/instrumentation.xjb
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/management/src/main/build-resources/instrumentation.xjb
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/management/src/main/build-resources/instrumentation.xjb
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java?rev=1229778&r1=1229777&r2=1229778&view=diff
==============================================================================
--- cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
(original)
+++ cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
Tue Jan 10 22:45:40 2012
@@ -51,10 +51,10 @@ import org.apache.cxf.buslifecycle.BusLi
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.management.InstrumentationManager;
-import org.apache.cxf.management.JMXConnectorPolicyType;
 import org.apache.cxf.management.ManagedComponent;
 import org.apache.cxf.management.ManagementConstants;
 import org.apache.cxf.management.jmx.export.runtime.ModelMBeanAssembler;
+import org.apache.cxf.management.jmx.type.JMXConnectorPolicyType;
 
 /**
  * The manager class for the JMXManagedComponent which hosts the JMXManagedComponents.



Mime
View raw message