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 21:38:26 UTC
svn commit: r1080340 - in /aries/trunk/jndi: jndi-api/
jndi-api/src/main/java/org/apache/aries/jndi/api/
jndi-api/src/main/java/org/apache/aries/jndi/spi/
jndi-api/src/main/java/org/apache/aries/jndi/urls/
jndi-api/src/main/java/org/osgi/service/jndi/ ...
Author: zoe
Date: Thu Mar 10 20:38:26 2011
New Revision: 1080340
URL: http://svn.apache.org/viewvc?rev=1080340&view=rev
Log:
ARIES-598 Make JNDI use packageinfo
Added:
aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/api/packageinfo
aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo
aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/urls/packageinfo
aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/packageinfo
Modified:
aries/trunk/jndi/jndi-api/pom.xml
aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/packageinfo
aries/trunk/jndi/jndi-bundle/pom.xml
aries/trunk/jndi/jndi-url/pom.xml
Modified: aries/trunk/jndi/jndi-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-api/pom.xml?rev=1080340&r1=1080339&r2=1080340&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-api/pom.xml (original)
+++ aries/trunk/jndi/jndi-api/pom.xml Thu Mar 10 20:38:26 2011
@@ -30,12 +30,15 @@
</description>
<properties>
- <aries.osgi.export>
- org.osgi.service.jndi;version="1.0.0",
- org.apache.aries.jndi.urls;version=${project.version},
- org.apache.aries.jndi.api;version=${project.version},
- org.apache.aries.jndi.spi;version=${project.version}
- </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.service.jndi,
+ org.apache.aries.jndi.urls,
+ org.apache.aries.jndi.api,
+ org.apache.aries.jndi.spi
+ </aries.osgi.export.pkg>
<aries.osgi.import>
!org.osgi.service.jndi*,
*
Added: aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/api/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/api/packageinfo?rev=1080340&view=auto
==============================================================================
--- aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/api/packageinfo (added)
+++ aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/api/packageinfo Thu Mar 10 20:38:26 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
Added: aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo?rev=1080340&view=auto
==============================================================================
--- aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo (added)
+++ aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo Thu Mar 10 20:38:26 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
Added: aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/urls/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/urls/packageinfo?rev=1080340&view=auto
==============================================================================
--- aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/urls/packageinfo (added)
+++ aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/urls/packageinfo Thu Mar 10 20:38:26 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/jndi/jndi-api/src/main/java/org/osgi/service/jndi/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/packageinfo?rev=1080340&r1=1080339&r2=1080340&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/packageinfo (original)
+++ aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/packageinfo Thu Mar 10 20:38:26 2011
@@ -17,4 +17,4 @@
# under the License.
#
-version 1.0
+version 1.0.0
Modified: aries/trunk/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-bundle/pom.xml?rev=1080340&r1=1080339&r2=1080340&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-bundle/pom.xml (original)
+++ aries/trunk/jndi/jndi-bundle/pom.xml Thu Mar 10 20:38:26 2011
@@ -31,11 +31,13 @@
</description>
<properties>
- <aries.osgi.export>
- org.osgi.service.jndi;version="1.0",
- org.apache.aries.jndi.urls;version=${project.version},
- org.apache.aries.jndi.spi;version=${project.version}
- </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.service.jndi,
+ org.apache.aries.jndi.urls,
+ org.apache.aries.jndi.spi
+ </aries.osgi.export.pkg>
<aries.osgi.import>
net.sf.cglib*;resolution:=optional,
*
Modified: aries/trunk/jndi/jndi-url/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url/pom.xml?rev=1080340&r1=1080339&r2=1080340&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url/pom.xml (original)
+++ aries/trunk/jndi/jndi-url/pom.xml Thu Mar 10 20:38:26 2011
@@ -32,6 +32,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.jndi.services
</aries.osgi.export.pkg>
Added: aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/packageinfo?rev=1080340&view=auto
==============================================================================
--- aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/packageinfo (added)
+++ aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/packageinfo Thu Mar 10 20:38:26 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