Author: dblevins
Date: Mon Nov 5 08:06:02 2012
New Revision: 1405708
URL: http://svn.apache.org/viewvc?rev=1405708&view=rev
Log:
The shading really messes up IDEs. Copying the classes over as it seems the
lesser of two evils
Added:
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/Description.java
- copied, changed from r1405596,
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/Description.java
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/MBean.java
- copied, changed from r1405596,
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/MBean.java
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/ManagedAttribute.java
- copied, changed from r1405596,
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/ManagedAttribute.java
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/ManagedOperation.java
- copied, changed from r1405596,
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/ManagedOperation.java
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/NotificationInfo.java
- copied, changed from r1405596,
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/NotificationInfo.java
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/NotificationInfos.java
- copied, changed from r1405596,
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/NotificationInfos.java
Modified:
openejb/trunk/openejb/container/openejb-api/pom.xml
Modified: openejb/trunk/openejb/container/openejb-api/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-api/pom.xml?rev=1405708&r1=1405707&r2=1405708&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-api/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-api/pom.xml Mon Nov 5 08:06:02 2012
@@ -70,20 +70,6 @@
<goal>shade</goal>
</goals>
<configuration>
- <relocations>
- <relocation>
- <pattern>javax.management</pattern>
- <shadedPattern>org.apache.openejb.api.jmx</shadedPattern>
- <includes>
- <include>javax.management.MBean</include>
- <include>javax.management.Description</include>
- <include>javax.management.ManagedAttribute</include>
- <include>javax.management.ManagedOperation</include>
- <include>javax.management.NotificationInfo</include>
- <include>javax.management.NotificationInfos</include>
- </includes>
- </relocation>
- </relocations>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
Copied:
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/Description.java
(from r1405596,
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/Description.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/Description.java?p2=openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/Description.java&p1=openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/Description.java&r1=1405596&r2=1405708&rev=1405708&view=diff
==============================================================================
---
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/Description.java
(original)
+++
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/Description.java
Mon Nov 5 08:06:02 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.management;
+package org.apache.openejb.api.jmx;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
Copied:
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/MBean.java
(from r1405596,
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/MBean.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/MBean.java?p2=openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/MBean.java&p1=openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/MBean.java&r1=1405596&r2=1405708&rev=1405708&view=diff
==============================================================================
---
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/MBean.java
(original)
+++
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/MBean.java
Mon Nov 5 08:06:02 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.management;
+package org.apache.openejb.api.jmx;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
Copied:
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/ManagedAttribute.java
(from r1405596,
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/ManagedAttribute.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/ManagedAttribute.java?p2=openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/ManagedAttribute.java&p1=openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/ManagedAttribute.java&r1=1405596&r2=1405708&rev=1405708&view=diff
==============================================================================
---
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/ManagedAttribute.java
(original)
+++
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/ManagedAttribute.java
Mon Nov 5 08:06:02 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.management;
+package org.apache.openejb.api.jmx;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
Copied:
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/ManagedOperation.java
(from r1405596,
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/ManagedOperation.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/ManagedOperation.java?p2=openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/ManagedOperation.java&p1=openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/ManagedOperation.java&r1=1405596&r2=1405708&rev=1405708&view=diff
==============================================================================
---
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/ManagedOperation.java
(original)
+++
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/ManagedOperation.java
Mon Nov 5 08:06:02 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.management;
+package org.apache.openejb.api.jmx;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
Copied:
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/NotificationInfo.java
(from r1405596,
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/NotificationInfo.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/NotificationInfo.java?p2=openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/NotificationInfo.java&p1=openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/NotificationInfo.java&r1=1405596&r2=1405708&rev=1405708&view=diff
==============================================================================
---
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/NotificationInfo.java
(original)
+++
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/NotificationInfo.java
Mon Nov 5 08:06:02 2012
@@ -14,8 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.management;
+package org.apache.openejb.api.jmx;
+import javax.management.Notification;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
Copied:
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/NotificationInfos.java
(from r1405596,
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/NotificationInfos.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/NotificationInfos.java?p2=openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/NotificationInfos.java&p1=openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/NotificationInfos.java&r1=1405596&r2=1405708&rev=1405708&view=diff
==============================================================================
---
openejb/trunk/openejb/deps/mbean-annotation-api/src/main/java/javax/management/NotificationInfos.java
(original)
+++
openejb/trunk/openejb/container/openejb-api/src/main/java/org/apache/openejb/api/jmx/NotificationInfos.java
Mon Nov 5 08:06:02 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.management;
+package org.apache.openejb.api.jmx;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
