You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2011/03/10 19:09:43 UTC
svn commit: r1080301 - in /aries/trunk/jmx: jmx-api/
jmx-api/src/main/java/org/osgi/jmx/
jmx-api/src/main/java/org/osgi/jmx/framework/
jmx-api/src/main/java/org/osgi/jmx/service/cm/
jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin/ jmx-api/sr...
Author: zoe
Date: Thu Mar 10 18:09:38 2011
New Revision: 1080301
URL: http://svn.apache.org/viewvc?rev=1080301&view=rev
Log:
ARIES-598 Switch JMX to using the packageinfo files (that were already there)
Added:
aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/packageinfo
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo
Modified:
aries/trunk/jmx/jmx-api/pom.xml
aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/packageinfo
aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/packageinfo
aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/cm/packageinfo
aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin/packageinfo
aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/packageinfo
aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/useradmin/packageinfo
aries/trunk/jmx/jmx-blueprint-api/pom.xml
aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
aries/trunk/jmx/jmx-blueprint-core/pom.xml
aries/trunk/jmx/jmx-bundle/pom.xml
aries/trunk/jmx/jmx-core/pom.xml
aries/trunk/jmx/jmx-whiteboard/pom.xml
Modified: aries/trunk/jmx/jmx-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api/pom.xml?rev=1080301&r1=1080300&r2=1080301&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-api/pom.xml (original)
+++ aries/trunk/jmx/jmx-api/pom.xml Thu Mar 10 18:09:38 2011
@@ -30,14 +30,17 @@
</description>
<properties>
- <aries.osgi.export>
- org.osgi.jmx;version="1.0.0";uses:="javax.management.openmbean",
- org.osgi.jmx.framework;version="1.5.0";uses:="org.osgi.jmx,javax.management.openmbean",
- org.osgi.jmx.service.cm;version="1.3.0";uses:="javax.management.openmbean",
- org.osgi.jmx.service.permissionadmin;version="1.2.0";uses:="org.osgi.jmx",
- org.osgi.jmx.service.provisioning;version="1.2.0";uses:="javax.management.openmbean",
- org.osgi.jmx.service.useradmin;version="1.1.0";uses:="org.osgi.jmx,javax.management.openmbean"
- </aries.osgi.export>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
+
+ <aries.osgi.export.pkg>
+ org.osgi.jmx;uses:="javax.management.openmbean",
+ org.osgi.jmx.framework;uses:="org.osgi.jmx,javax.management.openmbean",
+ org.osgi.jmx.service.cm;uses:="javax.management.openmbean",
+ org.osgi.jmx.service.permissionadmin;uses:="org.osgi.jmx",
+ org.osgi.jmx.service.provisioning;uses:="javax.management.openmbean",
+ org.osgi.jmx.service.useradmin;uses:="org.osgi.jmx,javax.management.openmbean"
+ </aries.osgi.export.pkg>
<aries.osgi.import>
!org.osgi.jmx*,
*
Modified: aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/packageinfo?rev=1080301&r1=1080300&r2=1080301&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/packageinfo (original)
+++ aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/packageinfo Thu Mar 10 18:09:38 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 1.5
+version 1.5.0
Modified: aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/packageinfo?rev=1080301&r1=1080300&r2=1080301&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/packageinfo (original)
+++ aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/packageinfo Thu Mar 10 18:09:38 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 1.0
+version 1.0.0
Modified: aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/cm/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/cm/packageinfo?rev=1080301&r1=1080300&r2=1080301&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/cm/packageinfo (original)
+++ aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/cm/packageinfo Thu Mar 10 18:09:38 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 1.3
+version 1.3.0
Modified: aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin/packageinfo?rev=1080301&r1=1080300&r2=1080301&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin/packageinfo (original)
+++ aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin/packageinfo Thu Mar 10 18:09:38 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 1.2
+version 1.2.0
Modified: aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/packageinfo?rev=1080301&r1=1080300&r2=1080301&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/packageinfo (original)
+++ aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/packageinfo Thu Mar 10 18:09:38 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 1.2
+version 1.2.0
Modified: aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/useradmin/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/useradmin/packageinfo?rev=1080301&r1=1080300&r2=1080301&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/useradmin/packageinfo (original)
+++ aries/trunk/jmx/jmx-api/src/main/java/org/osgi/jmx/service/useradmin/packageinfo Thu Mar 10 18:09:38 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 1.1
+version 1.1.0
Modified: aries/trunk/jmx/jmx-blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-api/pom.xml?rev=1080301&r1=1080300&r2=1080301&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-api/pom.xml (original)
+++ aries/trunk/jmx/jmx-blueprint-api/pom.xml Thu Mar 10 18:09:38 2011
@@ -30,6 +30,8 @@
</description>
<properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
<aries.osgi.export.pkg>
org.apache.aries.jmx.blueprint
</aries.osgi.export.pkg>
Added: aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/packageinfo?rev=1080301&view=auto
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/packageinfo (added)
+++ aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/packageinfo Thu Mar 10 18:09:38 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0
Modified: aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml?rev=1080301&r1=1080300&r2=1080301&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-bundle/pom.xml (original)
+++ aries/trunk/jmx/jmx-blueprint-bundle/pom.xml Thu Mar 10 18:09:38 2011
@@ -33,6 +33,8 @@
<aries.osgi.activator>
org.apache.aries.jmx.blueprint.impl.Activator
</aries.osgi.activator>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
<aries.osgi.export.pkg>
org.apache.aries.jmx.blueprint;
org.apache.aries.jmx.blueprint.codec
Modified: aries/trunk/jmx/jmx-blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-core/pom.xml?rev=1080301&r1=1080300&r2=1080301&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-core/pom.xml (original)
+++ aries/trunk/jmx/jmx-blueprint-core/pom.xml Thu Mar 10 18:09:38 2011
@@ -33,6 +33,8 @@
<aries.osgi.activator>
org.apache.aries.jmx.blueprint.impl.Activator
</aries.osgi.activator>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
<aries.osgi.export.pkg>
org.apache.aries.jmx.blueprint.codec
</aries.osgi.export.pkg>
Modified: aries/trunk/jmx/jmx-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-bundle/pom.xml?rev=1080301&r1=1080300&r2=1080301&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-bundle/pom.xml (original)
+++ aries/trunk/jmx/jmx-bundle/pom.xml Thu Mar 10 18:09:38 2011
@@ -33,14 +33,16 @@
<aries.osgi.activator>
org.apache.aries.jmx.Activator
</aries.osgi.activator>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
<aries.osgi.export>
- org.osgi.jmx;version="1.0.0";uses:="javax.management.openmbean",
- org.osgi.jmx.framework;version="1.5.0";uses:="org.osgi.jmx,javax.management.openmbean",
- org.osgi.jmx.service.cm;version="1.3.0";uses:="javax.management.openmbean",
- org.osgi.jmx.service.permissionadmin;version="1.2.0";uses:="org.osgi.jmx",
- org.osgi.jmx.service.provisioning;version="1.2.0";uses:="javax.management.openmbean",
- org.osgi.jmx.service.useradmin;version="1.1.0";uses:="org.osgi.jmx,javax.management.openmbean",
- org.apache.aries.jmx.codec;version="${project.version}"
+ org.osgi.jmx;uses:="javax.management.openmbean",
+ org.osgi.jmx.framework;uses:="org.osgi.jmx,javax.management.openmbean",
+ org.osgi.jmx.service.cm;uses:="javax.management.openmbean",
+ org.osgi.jmx.service.permissionadmin;uses:="org.osgi.jmx",
+ org.osgi.jmx.service.provisioning;uses:="javax.management.openmbean",
+ org.osgi.jmx.service.useradmin;uses:="org.osgi.jmx,javax.management.openmbean",
+ org.apache.aries.jmx.codec
</aries.osgi.export>
<aries.osgi.import>
!org.apache.aries.jmx*,
Modified: aries/trunk/jmx/jmx-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/pom.xml?rev=1080301&r1=1080300&r2=1080301&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core/pom.xml (original)
+++ aries/trunk/jmx/jmx-core/pom.xml Thu Mar 10 18:09:38 2011
@@ -50,6 +50,9 @@
org.osgi.jmx.service.useradmin;version="1.1.0",
*
</aries.osgi.import>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
+
<aries.osgi.export.pkg>
org.apache.aries.jmx.codec
</aries.osgi.export.pkg>
Added: aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo?rev=1080301&view=auto
==============================================================================
--- aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo (added)
+++ aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo Thu Mar 10 18:09:38 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0
Modified: aries/trunk/jmx/jmx-whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-whiteboard/pom.xml?rev=1080301&r1=1080300&r2=1080301&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-whiteboard/pom.xml (original)
+++ aries/trunk/jmx/jmx-whiteboard/pom.xml Thu Mar 10 18:09:38 2011
@@ -64,7 +64,6 @@
org.apache.aries.jmx.whiteboard.Activator
</aries.osgi.activator>
<aries.osgi.export.pkg>
- !*
</aries.osgi.export.pkg>
<aries.osgi.private.pkg>
org.apache.aries.jmx.whiteboard