geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r778992 - in /geronimo/xbean/trunk: ./ xbean-asm-shaded/ xbean-classloader/ xbean-finder-shaded/ xbean-finder/ xbean-naming/ xbean-naming/src/main/java/org/apache/xbean/naming/context/ xbean-reflect/ xbean-spring/
Date Wed, 27 May 2009 04:35:27 GMT
Author: djencks
Date: Wed May 27 04:35:27 2009
New Revision: 778992

URL: http://svn.apache.org/viewvc?rev=778992&view=rev
Log:
Fix up poms so they have what looks to me like accurate osgi metadata.  Also expose new naming configuration parameters

Modified:
    geronimo/xbean/trunk/pom.xml
    geronimo/xbean/trunk/xbean-asm-shaded/pom.xml
    geronimo/xbean/trunk/xbean-classloader/pom.xml
    geronimo/xbean/trunk/xbean-finder-shaded/pom.xml
    geronimo/xbean/trunk/xbean-finder/pom.xml
    geronimo/xbean/trunk/xbean-naming/pom.xml
    geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/WritableContext.java
    geronimo/xbean/trunk/xbean-reflect/pom.xml
    geronimo/xbean/trunk/xbean-spring/pom.xml

Modified: geronimo/xbean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/pom.xml?rev=778992&r1=778991&r2=778992&view=diff
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Wed May 27 04:35:27 2009
@@ -1,32 +1,33 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-<!--
+    <!--
 
-    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
+        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
+           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.
+        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.
 
--->
+    -->
 
-<!-- $Rev: 432962 $ $Date: 2006-08-20 03:47:39 -0700 (Sun, 20 Aug 2006) $ -->
+    <!-- $Rev: 432962 $ $Date: 2006-08-20 03:47:39 -0700 (Sun, 20 Aug 2006) $ -->
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>4</version>
+        <version>6</version>
     </parent>
 
     <groupId>org.apache.xbean</groupId>
@@ -34,50 +35,35 @@
     <name>Apache XBean</name>
     <packaging>pom</packaging>
     <inceptionYear>2005</inceptionYear>
-    
+
     <version>3.6-SNAPSHOT</version>
-    
+
     <description>
         XBean is a plugin based server architecture.
     </description>
-    
+
     <url>http://geronimo.apache.org/xbean</url>
-    
+
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/xbean/trunk</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/xbean/trunk</developerConnection>
         <url>http://svn.apache.org/viewvc/geronimo/xbean/trunk</url>
     </scm>
-    
+
     <properties>
-      <siteId>xbean</siteId>
-      <!--
-          |
-          | OSGi properties
-          |
-          | Note: when modules can override these properties.
-          |
-          -->
-	    <xbean.osgi.import.pkg>*</xbean.osgi.import.pkg>
-	    <xbean.osgi.export.pkg>org.apache.xbean*</xbean.osgi.export.pkg>
-	    <xbean.osgi.private.pkg />
-	    <xbean.osgi.export>!META-INF*,${xbean.osgi.export.pkg}*;version=${xbean.osgi.export.version}</xbean.osgi.export>
-	    <xbean.osgi.export.version>${project.version}</xbean.osgi.export.version>
-	    <xbean.osgi.import>!META-INF*,${xbean.osgi.import.pkg}</xbean.osgi.import>
-	    <xbean.osgi.symbolic.name>${groupId}.${artifactId}</xbean.osgi.symbolic.name>
-
-      <!--
-      - http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding
-      -->
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <siteId>xbean</siteId>
+        <!--
+        - http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding
+        -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    
+
     <issueManagement>
         <system>jira</system>
         <url>http://issues.apache.org/jira/browse/XBEAN</url>
     </issueManagement>
-    
+
     <mailingLists>
         <mailingList>
             <name>xbean developers</name>
@@ -89,8 +75,13 @@
             <subscribe>mailto:xbean-user-subscribe@geronimo.apache.org</subscribe>
             <unsubscribe>mailto:xbean-user-unsubscribe@geronimo.apache.org</unsubscribe>
         </mailingList>
+        <mailingList>
+            <name>xbean scm</name>
+            <subscribe>mailto:xbean-scm-subscribe@geronimo.apache.org</subscribe>
+            <unsubscribe>mailto:xbean-scm-unsubscribe@geronimo.apache.org</unsubscribe>
+        </mailingList>
     </mailingLists>
-    
+
     <developers>
         <developer>
             <id>chirino</id>
@@ -159,88 +150,96 @@
             </roles>
             <timezone>+1</timezone>
         </developer>
+        <developer>
+            <id>djencks</id>
+            <name>David Jencks</name>
+            <roles>
+                <role>Commiter</role>
+            </roles>
+            <timezone>-8</timezone>
+        </developer>
     </developers>
-    
+
     <dependencyManagement>
         <dependencies>
-            
+
             <dependency>
                 <groupId>ant</groupId>
                 <artifactId>ant</artifactId>
                 <version>1.6.2</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib-nodep</artifactId>
                 <version>2.1_2</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils</artifactId>
                 <version>1.7.0</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
                 <version>1.0.3</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>groovy</groupId>
                 <artifactId>groovy</artifactId>
                 <version>1.0-jsr-03</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>mx4j</groupId>
                 <artifactId>mx4j</artifactId>
                 <version>3.0.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
                 <version>2.0.5</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
                 <version>2.0.5</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-web</artifactId>
                 <version>2.0.5</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>com.thoughtworks.qdox</groupId>
                 <artifactId>qdox</artifactId>
                 <version>1.6.3</version>
             </dependency>
-            
+
         </dependencies>
     </dependencyManagement>
-    
+
     <dependencies>
-    
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
-        
+
     </dependencies>
-    
+
     <build>
         <defaultGoal>install</defaultGoal>
-        
+
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -253,154 +252,92 @@
                     <artifactId>maven-xbean-plugin</artifactId>
                     <version>${pom.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.5</source>
+                        <target>1.5</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <failIfNoTests>false</failIfNoTests>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <configuration>
+                        <preparationGoals>clean,verify,install</preparationGoals>
+                        <autoVersionSubmodules>true</autoVersionSubmodules>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>ianal-maven-plugin</artifactId>
+                    <version>1.0-alpha-1</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>verify-legal-files</goal>
+                            </goals>
+                            <configuration>
+                                <!-- Fail the build if any artifacts are missing legal files -->
+                                <strict>true</strict>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>2.0.0</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <instructions>
+                            <Bundle-DocURL>${project.url}</Bundle-DocURL>
+                            <Export-Package>org.apache.xbean.*;version=${pom.version}</Export-Package>
+                            <Private-Package/>
+                        </instructions>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-remote-resources-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>process</goal>
+                            </goals>
+                            <configuration>
+                                <properties>
+                                    <addLicense>true</addLicense>
+                                    <addArtifact>true</addArtifact>
+                                    <projectName>Apache XBean</projectName>
+                                </properties>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
-        
+
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <failIfNoTests>false</failIfNoTests>
-                </configuration>
-            </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.0-beta-7</version>
-                <configuration>
-                    <preparationGoals>clean,verify,install</preparationGoals>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                </configuration>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>ianal-maven-plugin</artifactId>
             </plugin>
-            
-            <!-- Add NOTICE and LICENSE to jars -->
             <plugin>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <configuration>
-                            <resourceBundles>
-                                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-                            </resourceBundles>
-                            <properties>
-                                <addLicense>true</addLicense>
-                                <addArtifact>true</addArtifact>
-                                <projectName>Apache XBean</projectName>
-                            </properties>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
             </plugin>
-
-            <!-- OSGi bundles plugin -->
-	        <plugin>
-	            <groupId>org.apache.felix</groupId>
-	            <artifactId>maven-bundle-plugin</artifactId>
-	            <version>1.4.0</version>
-	            <extensions>true</extensions>
-	            <configuration>
-		            <instructions>
-		                <Bundle-Name>${artifactId}</Bundle-Name>
-		                <Bundle-SymbolicName>${xbean.osgi.symbolic.name}</Bundle-SymbolicName>
-		                <Export-Package>${xbean.osgi.export}</Export-Package>
-		                <Import-Package>${xbean.osgi.import}</Import-Package>
-		                <Private-Package>${xbean.osgi.private.pkg}</Private-Package>
-		                <Implementation-Title>Apache XBean</Implementation-Title>
-		                <Implementation-Version>${project.version}</Implementation-Version>
-		           </instructions>
-		        </configuration>
-	        </plugin>
         </plugins>
-    </build>    
-    <profiles>
-        <profile>
-           <id>release</id>
-            <build>
-                <plugins>
-                    <!-- We want to sign the artifact, the POM, and all attached artifacts -->
-                    <plugin>
-                        <inherited>true</inherited>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.0-alpha-4</version>
-                        <configuration>
-                            <passphrase>${gpg.passphrase}</passphrase>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!-- We want to deploy the artifact to a staging location for perusal -->
-                    <plugin>
-                        <inherited>true</inherited>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.3</version>
-                        <configuration>
-                            <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
-                            <updateReleaseInfo>true</updateReleaseInfo>
-                        </configuration>
-                    </plugin>
-	              </plugins>
-	          </build>
-	      </profile>
-	      <profile>
-	          <id>deploy</id>
-	          <build>
-	              <defaultGoal>deploy</defaultGoal>
-	              <plugins>
-                    <!-- We want the Source JAR published with the release -->
-		            <plugin>
-		                <groupId>org.apache.maven.plugins</groupId>
-		                <artifactId>maven-source-plugin</artifactId>
-                        <version>2.0.4</version>
-		                <executions>
-		                    <execution>
-		                        <goals>
-		                            <goal>jar</goal>
-		                        </goals>
-		                    </execution>
-		                </executions>
-		            </plugin>
-                    <!-- We want the JavaDoc JAR published with the release -->
-                    <plugin>
-                        <inherited>true</inherited>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.4</version>
-                        <configuration>
-                            <source>1.5</source>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-    
+    </build>
+
     <modules>
         <module>xbean-classloader</module>
         <module>xbean-classpath</module>
@@ -413,43 +350,15 @@
         <module>xbean-asm-shaded</module>
         <module>xbean-finder-shaded</module>
     </modules>
-    
-    <repositories>
 
-        <!--
-        NOTE: The default repositories are picked up by Genesis, but need to
-              specify where Genesis lives to pick it up + any additional repositories.
-        -->
-        
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-    
+
     <distributionManagement>
         <site>
-            <id>geronimo-website</id>
+            <id>xbean-website</id>
             <url>scp://people.apache.org/www/geronimo.apache.org/maven/xbean</url>
         </site>
-        <snapshotRepository>
-            <id>apache.snapshots</id>
-            <name>Apache Development Snapshot Repository</name>
-            <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-            <uniqueVersion>false</uniqueVersion>
-        </snapshotRepository>
     </distributionManagement>
-    
+
     <reporting>
         <plugins>
             <plugin>
@@ -465,7 +374,7 @@
                     <source>1.5</source>
                     <!--
                     FIXME: This worked in m1, but m2 complains about it being an invalid flag
-                    
+
                     <additionalparam>-J-Djava.awt.headless=true</additionalparam>
                     -->
                     <linksource>true</linksource>
@@ -474,11 +383,11 @@
                         <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
                         <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
                         <link>http://java.sun.com/j2se/1.3/docs/api/</link>
-                        
+
                         <!-- JEE -->
                         <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
                         <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api/</link>
-                        
+
                         <!-- Libraries -->
                         <link>http://jakarta.apache.org/commons/collections/apidocs</link>
                         <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
@@ -488,7 +397,7 @@
                     </links>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
@@ -497,12 +406,12 @@
                     <targetJdk>1.5</targetJdk>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jxr-maven-plugin</artifactId>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>surefire-report-maven-plugin</artifactId>

Modified: geronimo/xbean/trunk/xbean-asm-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm-shaded/pom.xml?rev=778992&r1=778991&r2=778992&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-asm-shaded/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-asm-shaded/pom.xml Wed May 27 04:35:27 2009
@@ -23,66 +23,110 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>xbean</artifactId>
-    <groupId>org.apache.xbean</groupId>
-    <version>3.6-SNAPSHOT</version>
-  </parent>
-  <artifactId>xbean-asm-shaded</artifactId>
-  <packaging>bundle</packaging>
-  <name>Apache XBean :: ASM shaded (repackaged)</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <relocations>
-                <relocation>
-                  <pattern>org.objectweb.asm</pattern>
-                  <shadedPattern>org.apache.xbean.asm</shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <unzip src="${project.build.directory}/xbean-asm-shaded-${pom.version}.jar" dest="${project.build.directory}/classes"/>
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>3.1</version>
-    </dependency>
-  </dependencies>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>xbean</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <version>3.6-SNAPSHOT</version>
+    </parent>
+    <artifactId>xbean-asm-shaded</artifactId>
+    <packaging>jar</packaging>
+    <name>Apache XBean :: ASM shaded (repackaged)</name>
+
+    <description>Repackaged and shaded asm jars</description>
+    <licenses>
+        <license>
+            <url>http://asm.ow2.org/license.html</url>
+        </license>
+        <license>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <xbean.osgi.export>org.apache.xbean.asm;version=3.1,org.apache.xbean.asm.signature;version=3.1,org.apache.xbean.asm.commons;version=3.1,org.apache.xbean.asm.tree;version=3.1</xbean.osgi.export>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.objectweb.asm</pattern>
+                                    <shadedPattern>org.apache.xbean.asm</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <manifestEntries>
+                                        <Bundle-Name>${pom.name}</Bundle-Name>
+                                        <Bundle-Vendor>${organization.name}</Bundle-Vendor>
+                                        <Bundle-Version>${version}</Bundle-Version>
+                                        <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                                        <Bundle-License>http://asm.ow2.org/license.html</Bundle-License>
+                                        <Bundle-Description>${description}</Bundle-Description>
+                                        <Bundle-DocURL>${project.url}</Bundle-DocURL>
+                                        <Export-Package>${xbean.osgi.export}</Export-Package>
+                                        <Import-Package>${xbean.osgi.export}</Import-Package>
+                                        <Bundle-SymbolicName>org.apache.xbean.asm-shaded</Bundle-SymbolicName>
+                                    </manifestEntries>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- the antrun plugin does not affect the contents of the jar but does somehow make the jar available to other modules ???? -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <unzip src="${project.build.directory}/xbean-asm-shaded-${pom.version}.jar" dest="${project.build.directory}/classes"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--<plugin>-->
+            <!--<groupId>org.apache.felix</groupId>-->
+            <!--<artifactId>maven-bundle-plugin</artifactId>-->
+            <!--<extensions>true</extensions>-->
+            <!--<configuration>-->
+            <!--<instructions>-->
+            <!--<Export-Package>org.apache.xbean.asm;version=3.1</Export-Package>-->
+            <!--<Import-Package>${xbean.osgi.import}</Import-Package>-->
+            <!--<Private-Package/>-->
+            <!--</instructions>-->
+            <!--</configuration>-->
+            <!--</plugin>-->
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>3.1</version>
+        </dependency>
+    </dependencies>
 </project>

Modified: geronimo/xbean/trunk/xbean-classloader/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-classloader/pom.xml?rev=778992&r1=778991&r2=778992&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-classloader/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-classloader/pom.xml Wed May 27 04:35:27 2009
@@ -32,8 +32,7 @@
     <artifactId>xbean-classloader</artifactId>
     <packaging>bundle</packaging>
     <name>Apache XBean :: Classloader</name>
-    <version>3.6-SNAPSHOT</version>
-
+    <description>xbean-classloader includes a flexibie multi-parent classloader</description>
     <build>
         <plugins>
             <plugin>

Modified: geronimo/xbean/trunk/xbean-finder-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder-shaded/pom.xml?rev=778992&r1=778991&r2=778992&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder-shaded/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-finder-shaded/pom.xml Wed May 27 04:35:27 2009
@@ -23,66 +23,88 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>xbean</artifactId>
-    <groupId>org.apache.xbean</groupId>
-    <version>3.6-SNAPSHOT</version>
-  </parent>
-  <artifactId>xbean-finder-shaded</artifactId>
-  <packaging>bundle</packaging>
-  <name>Apache XBean :: Finder shaded (repackaged)</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <relocations>
-                <relocation>
-                  <pattern>org.objectweb.asm</pattern>
-                  <shadedPattern>org.apache.xbean.asm</shadedPattern>
-                </relocation>
-              </relocations>
-              <!-- this doesn't seem to work... what am I doing wrong? -->
-              <artifactSet>
-                <excludes>
-                  <exclude>org.apache.xbean:xbean-asm-shaded</exclude>
-                </excludes>
-              </artifactSet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-finder</artifactId>
-      <version>${version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>asm</groupId>
-          <artifactId>asm</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>asm</groupId>
-          <artifactId>asm-commons</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <!-- see above note in shade plugin configuration -->
-    <!--<dependency>-->
-      <!--<groupId>org.apache.xbean</groupId>-->
-      <!--<artifactId>xbean-asm-shaded</artifactId>-->
-      <!--<version>${version}</version>-->
-    <!--</dependency>-->
-  </dependencies>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>xbean</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <version>3.6-SNAPSHOT</version>
+    </parent>
+    <artifactId>xbean-finder-shaded</artifactId>
+    <packaging>jar</packaging>
+    <name>Apache XBean :: Finder shaded (repackaged)</name>
+
+    <properties>
+        <xbean.osgi.export>org.apache.xbean.finder;version=${pom.version}</xbean.osgi.export>
+        <xbean.osgi.import>org.apache.xbean.finder;version=${pom.version},org.apache.xbean.asm;version=3.1,org.apache.xbean.asm.commons;version=3.1</xbean.osgi.import>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.objectweb.asm</pattern>
+                                    <shadedPattern>org.apache.xbean.asm</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <!-- this doesn't seem to work... what am I doing wrong? -->
+                            <artifactSet>
+                                <excludes>
+                                    <exclude>org.apache.xbean:xbean-asm-shaded</exclude>
+                                </excludes>
+                            </artifactSet>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <manifestEntries>
+                                        <Bundle-Name>${pom.name}</Bundle-Name>
+                                        <Bundle-Vendor>${organization.name}</Bundle-Vendor>
+                                        <Bundle-Version>${version}</Bundle-Version>
+                                        <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                                        <Bundle-License>${license.url}</Bundle-License>
+                                        <Bundle-Description>${description}</Bundle-Description>
+                                        <Bundle-DocURL>${project.url}</Bundle-DocURL>
+                                        <Export-Package>${xbean.osgi.export}</Export-Package>
+                                        <Import-Package>${xbean.osgi.import}</Import-Package>
+                                        <Bundle-SymbolicName>org.apache.xbean.finder-shaded</Bundle-SymbolicName>
+                                    </manifestEntries>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-finder</artifactId>
+            <version>${version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>asm</groupId>
+                    <artifactId>asm</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>asm</groupId>
+                    <artifactId>asm-commons</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- see above note in shade plugin configuration -->
+        <!--<dependency>-->
+        <!--<groupId>org.apache.xbean</groupId>-->
+        <!--<artifactId>xbean-asm-shaded</artifactId>-->
+        <!--<version>${version}</version>-->
+        <!--</dependency>-->
+    </dependencies>
 </project>

Modified: geronimo/xbean/trunk/xbean-finder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/pom.xml?rev=778992&r1=778991&r2=778992&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-finder/pom.xml Wed May 27 04:35:27 2009
@@ -23,27 +23,43 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>xbean</artifactId>
-    <groupId>org.apache.xbean</groupId>
-    <version>3.6-SNAPSHOT</version>
-  </parent>
-  <artifactId>xbean-finder</artifactId>
-  <packaging>bundle</packaging>
-  <name>Apache XBean :: Classpath Resource Finder</name>
-  <dependencies>
-      <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>3.1</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
-        <version>3.1</version>
-        <scope>provided</scope>
-      </dependency>
-  </dependencies>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>xbean</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <version>3.6-SNAPSHOT</version>
+    </parent>
+    <artifactId>xbean-finder</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache XBean :: Classpath Resource Finder</name>
+    <description>XBean Finder helps to find annotations in classes</description>
+    <dependencies>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>3.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>3.1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.0.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>*,org.objectweb.asm;version=3.1,org.objectweb.asm.commons;version=3.1</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: geronimo/xbean/trunk/xbean-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-naming/pom.xml?rev=778992&r1=778991&r2=778992&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-naming/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-naming/pom.xml Wed May 27 04:35:27 2009
@@ -1,33 +1,34 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-<!--
+    <!--
 
-    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.
-
--->
-
-<!-- $Rev: 432962 $ $Date: 2006-08-20 03:47:39 -0700 (Sun, 20 Aug 2006) $ -->
-
-  <parent>
-    <artifactId>xbean</artifactId>
-    <groupId>org.apache.xbean</groupId>
-    <version>3.6-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>xbean-naming</artifactId>
-  <packaging>bundle</packaging>
-  <name>Apache XBean :: Naming</name>
+        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.
+
+    -->
+
+    <!-- $Rev: 432962 $ $Date: 2006-08-20 03:47:39 -0700 (Sun, 20 Aug 2006) $ -->
+
+    <parent>
+        <artifactId>xbean</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <version>3.6-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>xbean-naming</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache XBean :: Naming</name>
+    <description>xbean-naming implements a flexible non-persistent jndi provider</description>
 
 </project>

Modified: geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/WritableContext.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/WritableContext.java?rev=778992&r1=778991&r2=778992&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/WritableContext.java (original)
+++ geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/WritableContext.java Wed May 27 04:35:27 2009
@@ -42,9 +42,9 @@
     private final AtomicReference<Map<String, Object>> bindingsRef;
     private final AtomicReference<Map<String, Object>> indexRef;
     private final boolean cacheReferences;
-    private final boolean supportReferenceable = true;
-    private final boolean checkDereferenceDifferent = true;
-    private final boolean assumeDereferenceBound = false;
+    private final boolean supportReferenceable;
+    private final boolean checkDereferenceDifferent;
+    private final boolean assumeDereferenceBound;
 
     public WritableContext() throws NamingException {
         this("", Collections.<String, Object>emptyMap(), ContextAccess.MODIFIABLE, false);
@@ -67,12 +67,24 @@
     }
 
     public WritableContext(String nameInNamespace, Map<String, Object> bindings, ContextAccess contextAccess, boolean cacheReferences) throws NamingException {
+        this(nameInNamespace, bindings, contextAccess, cacheReferences, true, true, false);
+    }
+    public WritableContext(String nameInNamespace,
+                           Map<String, Object> bindings,
+                           ContextAccess contextAccess,
+                           boolean cacheReferences,
+                           boolean supportReferenceable,
+                           boolean checkDereferenceDifferent,
+                           boolean assumeDereferenceBound) throws NamingException {
         super(nameInNamespace, contextAccess);
 
         this.cacheReferences = cacheReferences;
         if (this.cacheReferences) {
             bindings = CachingReference.wrapReferences(bindings, this);
         }
+        this.supportReferenceable = supportReferenceable;
+        this.checkDereferenceDifferent = checkDereferenceDifferent;
+        this.assumeDereferenceBound = assumeDereferenceBound;
 
         Map<String, Object> localBindings = ContextUtil.createBindings(bindings, this);
 

Modified: geronimo/xbean/trunk/xbean-reflect/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-reflect/pom.xml?rev=778992&r1=778991&r2=778992&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-reflect/pom.xml Wed May 27 04:35:27 2009
@@ -23,77 +23,97 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>xbean</artifactId>
-    <groupId>org.apache.xbean</groupId>
-    <version>3.6-SNAPSHOT</version>
-  </parent>
-  <artifactId>xbean-reflect</artifactId>
-  <packaging>bundle</packaging>
-  <name>Apache XBean :: Reflect</name>
-  <dependencies>
-      <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>3.1</version>
-        <scope>provided</scope>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
-        <version>3.1</version>
-        <scope>provided</scope>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>xbean</artifactId>
         <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-asm-shaded</artifactId>
         <version>3.6-SNAPSHOT</version>
-        <scope>provided</scope>
-        <optional>true</optional>
-      </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.12</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
-      <version>1.1</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-  <profiles>
-    <profile>
-      <id>debug</id>
-      <activation>
-        <property>
-          <name>DEBUG</name>
-        </property>
-      </activation>
-      <build>
+    </parent>
+    <artifactId>xbean-reflect</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache XBean :: Reflect</name>
+    <description>xbean-reflect provides very flexible ways to creat objects and graphs of objects for DI frameworks</description>
+    <dependencies>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>3.1</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>3.1</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-asm-shaded</artifactId>
+            <version>3.6-SNAPSHOT</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.12</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-api</artifactId>
+            <version>1.1</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+    <!-- todo Either figure out resolution=optional + dynamic imports for the loggers or construct fragment bundles for them -->
+    <build>
         <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.2</version>
-            <configuration>
-              <forkMode>pertest</forkMode>
-              <argLine>
-                -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
-                -enableassertions
-              </argLine>
-              <workingDirectory>${basedir}/target</workingDirectory>
-            </configuration>
-          </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.0.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>!org.apache.xbean.asm.*,org.apache.xbean.*;version=${pom.version}</Export-Package>
+                        <Import-Package>*,org.apache.log4j;resolution=optional,org.apache.commons.logging;resolution=optional,org.objectweb.asm;resolution=optional;version=3.1,org.objectweb.asm.commons;resolution=optional;version=3.1,org.apache.xbean.asm;resolution=optional;version=3.1,org.apache.xbean.asm.commons;resolution=optional;version=3.1
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
-      </build>
-    </profile>
-  </profiles>
+    </build>
+    <profiles>
+        <profile>
+            <id>debug</id>
+            <activation>
+                <property>
+                    <name>DEBUG</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.2</version>
+                        <configuration>
+                            <forkMode>pertest</forkMode>
+                            <argLine>
+                                -Xdebug -Xnoagent -Djava.compiler=NONE
+                                -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
+                                -enableassertions
+                            </argLine>
+                            <workingDirectory>${basedir}/target</workingDirectory>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/xbean/trunk/xbean-spring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/pom.xml?rev=778992&r1=778991&r2=778992&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-spring/pom.xml Wed May 27 04:35:27 2009
@@ -1,25 +1,25 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-<!--
+    <!--
 
-    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.
+        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.
 
--->
+    -->
 
-<!-- $Rev: 432962 $ $Date: 2006-08-20 03:47:39 -0700 (Sun, 20 Aug 2006) $ -->
+    <!-- $Rev: 432962 $ $Date: 2006-08-20 03:47:39 -0700 (Sun, 20 Aug 2006) $ -->
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,17 +32,19 @@
     <artifactId>xbean-spring</artifactId>
     <packaging>bundle</packaging>
     <name>Apache XBean :: Spring</name>
-	
-	<properties>
-		<xbean.osgi.import.pkg>
-			com.thoughtworks.qdox*;resolution:=optional,
-			org.apache.tools.ant*;resolution:=optional,
-			org.springframework.core;resolution:=optional,
-			org.springframework.web*;resolution:=optional,
-			*
-		</xbean.osgi.import.pkg>
-	</properties>
-	
+
+    <description>xbean-spring provides a schema-driven proprietary namespace handler for spring contexts</description>
+
+    <properties>
+        <xbean.osgi.import.pkg>
+            com.thoughtworks.qdox*;resolution:=optional,
+            org.apache.tools.ant*;resolution:=optional,
+            org.springframework.core;resolution:=optional,
+            org.springframework.web*;resolution:=optional,
+            *
+        </xbean.osgi.import.pkg>
+    </properties>
+
     <dependencies>
 
         <dependency>
@@ -81,7 +83,7 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <testResources>
             <testResource>
@@ -113,39 +115,39 @@
                             <tasks>
                                 <taskdef classname="org.apache.xbean.spring.generator.MappingGeneratorTask" name="mapping">
                                     <classpath>
-                                        <pathelement path="${basedir}/target/classes" />
-                                        <pathelement path="${basedir}/target/test-classes" />
-                                        <path refid="maven.runtime.classpath" />
+                                        <pathelement path="${basedir}/target/classes"/>
+                                        <pathelement path="${basedir}/target/test-classes"/>
+                                        <path refid="maven.runtime.classpath"/>
                                     </classpath>
                                 </taskdef>
-                                <mapping namespace="http://xbean.apache.org/schemas/pizza" srcdir="src/test/java" destFile="target/restaurant.xsd" metaInfDir="${basedir}/target/test-generated/" />
+                                <mapping namespace="http://xbean.apache.org/schemas/pizza" srcdir="src/test/java" destFile="target/restaurant.xsd" metaInfDir="${basedir}/target/test-generated/"/>
                                 <copy todir="${basedir}/target/test-classes">
-                                    <fileset dir="${basedir}/target/test-generated" />
+                                    <fileset dir="${basedir}/target/test-generated"/>
                                 </copy>
                             </tasks>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-               <plugin>
-                   <groupId>org.apache.felix</groupId>
-                   <artifactId>maven-bundle-plugin</artifactId>
-                   <extensions>true</extensions>
-                   <configuration>
-                           <instructions>
-                               <Bundle-Name>${artifactId}</Bundle-Name>
-                               <Bundle-SymbolicName>${xbean.osgi.symbolic.name}</Bundle-SymbolicName>
-                               <Export-Package>${xbean.osgi.export}</Export-Package>
-                               <Import-Package>${xbean.osgi.import}</Import-Package>
-                               <Private-Package>${xbean.osgi.private.pkg}</Private-Package>
-                               <Implementation-Title>Apache XBean</Implementation-Title>
-                               <Implementation-Version>${project.version}</Implementation-Version>
-                               <DynamicImport-Package>META-INF.services.org.apache.xbean.spring.*,META-INF.services.org.xbean.spring</DynamicImport-Package>
-                               <_failok>true</_failok>
-                          </instructions>
-                       </configuration>
-               </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            com.thoughtworks.qdox*;resolution:=optional,
+                            org.apache.tools.ant*;resolution:=optional,
+                            org.springframework.core;resolution:=optional,
+                            org.springframework.web*;resolution:=optional,
+                            *
+                        </Import-Package>
+                        <DynamicImport-Package>META-INF.services.org.apache.xbean.spring.*,META-INF.services.org.xbean.spring</DynamicImport-Package>
+                        <_failok>true</_failok>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-    
+
 </project>



Mime
View raw message