Author: thomas.diesler(a)jboss.com Date: 2009-04-28 10:54:51 -0400 (Tue, 28 Apr 2009) New Revision: 87947 Added: projects/jboss-osgi/bundles/jboss/xml-binding/ projects/jboss-osgi/bundles/jboss/xml-binding/pom.xml Removed: projects/jboss-osgi/bundles/jboss/.classpath Modified: projects/jboss-osgi/bundles/.project projects/jboss-osgi/bundles/apache/pom.xml projects/jboss-osgi/bundles/apache/xerces/ projects/jboss-osgi/bundles/apache/xerces/pom.xml projects/jboss-osgi/bundles/jboss/pom.xml projects/jboss-osgi/bundles/pom.xml Log: use unversioned xerces exports Modified: projects/jboss-osgi/bundles/.project =================================================================== --- projects/jboss-osgi/bundles/.project 2009-04-28 14:13:01 UTC (rev 87946) +++ projects/jboss-osgi/bundles/.project 2009-04-28 14:54:51 UTC (rev 87947) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss-bundles-parent</name> + <name>jboss-bundles</name> <comment></comment> <projects> </projects> Modified: projects/jboss-osgi/bundles/apache/pom.xml =================================================================== --- projects/jboss-osgi/bundles/apache/pom.xml 2009-04-28 14:13:01 UTC (rev 87946) +++ projects/jboss-osgi/bundles/apache/pom.xml 2009-04-28 14:54:51 UTC (rev 87947) @@ -4,12 +4,12 @@ <name>JBossOSGi - Bundles Apache</name> <groupId>org.jboss.osgi.bundles.apache</groupId> - <artifactId>jboss-bundles-apache-parent</artifactId> + <artifactId>jboss-bundles-apache</artifactId> <packaging>pom</packaging> <parent> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-bundles-parent</artifactId> + <artifactId>jboss-bundles</artifactId> <version>1.0.0</version> </parent> Property changes on: projects/jboss-osgi/bundles/apache/xerces ___________________________________________________________________ Name: svn:ignore + target Modified: projects/jboss-osgi/bundles/apache/xerces/pom.xml =================================================================== --- projects/jboss-osgi/bundles/apache/xerces/pom.xml 2009-04-28 14:13:01 UTC (rev 87946) +++ projects/jboss-osgi/bundles/apache/xerces/pom.xml 2009-04-28 14:54:51 UTC (rev 87947) @@ -5,13 +5,13 @@ <name>JBossOSGi - Bundles Apache Xerces</name> <groupId>org.jboss.osgi.bundles.apache</groupId> <artifactId>apache-xerces</artifactId> - <packaging>jar</packaging> + <packaging>bundle</packaging> <version>2.9.1-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi.bundles.apache</groupId> - <artifactId>jboss-bundles-apache-parent</artifactId> + <artifactId>jboss-bundles-apache</artifactId> <version>1.0.0</version> </parent> @@ -48,18 +48,14 @@ <execution> <phase>package</phase> <goals> - <goal>bundle</goal> + <goal>wrap</goal> </goals> </execution> </executions> <configuration> <instructions> - <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> - <Export-Package> - com.wutka.dtd;version=${version.wutka.dtdparser}, - org.apache.xml*;version=${version.apache.xerces}, - org.apache.xerces*;version=${version.apache.xerces}, - </Export-Package> + <Embed-Dependency>*;inline=false</Embed-Dependency> + <_exportcontents>*</_exportcontents> </instructions> </configuration> </plugin> Deleted: projects/jboss-osgi/bundles/jboss/.classpath =================================================================== --- projects/jboss-osgi/bundles/jboss/.classpath 2009-04-28 14:13:01 UTC (rev 87946) +++ projects/jboss-osgi/bundles/jboss/.classpath 2009-04-28 14:54:51 UTC (rev 87947) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Modified: projects/jboss-osgi/bundles/jboss/pom.xml =================================================================== --- projects/jboss-osgi/bundles/jboss/pom.xml 2009-04-28 14:13:01 UTC (rev 87946) +++ projects/jboss-osgi/bundles/jboss/pom.xml 2009-04-28 14:54:51 UTC (rev 87947) @@ -4,17 +4,18 @@ <name>JBossOSGi - Bundles JBoss</name> <groupId>org.jboss.osgi.bundles.jboss</groupId> - <artifactId>jboss-bundles-jboss-parent</artifactId> + <artifactId>jboss-bundles-jboss</artifactId> <packaging>pom</packaging> <parent> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-bundles-parent</artifactId> + <artifactId>jboss-bundles</artifactId> <version>1.0.0</version> </parent> <!-- Modules --> <modules> + <module>xml-binding</module> </modules> </project> Copied: projects/jboss-osgi/bundles/jboss/xml-binding/pom.xml (from rev 87938, projects/jboss-osgi/bundles/apache/xerces/pom.xml) =================================================================== --- projects/jboss-osgi/bundles/jboss/xml-binding/pom.xml (rev 0) +++ projects/jboss-osgi/bundles/jboss/xml-binding/pom.xml 2009-04-28 14:54:51 UTC (rev 87947) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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> + + <name>JBossOSGi - Bundles JBoss XML Binding</name> + <groupId>org.jboss.osgi.bundles.jboss</groupId> + <artifactId>jbossxb</artifactId> + <packaging>bundle</packaging> + + <version>2.0.0-SNAPSHOT</version> + + <parent> + <groupId>org.jboss.osgi.bundles.jboss</groupId> + <artifactId>jboss-bundles-jboss</artifactId> + <version>1.0.0</version> + </parent> + + <properties> + <version.jboss.xb>2.0.0.GA</version.jboss.xb> + <version.apache.xerces>2.9.1-SNAPSHOT</version.apache.xerces> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.osgi.bundles.apache</groupId> + <artifactId>apache-xerces</artifactId> + <version>${version.apache.xerces}</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>${version.jboss.xb}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> + <Export-Package> + org.jboss.xml.binding;version=${version.jboss.xb}, + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + +</project> Property changes on: projects/jboss-osgi/bundles/jboss/xml-binding/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Modified: projects/jboss-osgi/bundles/pom.xml =================================================================== --- projects/jboss-osgi/bundles/pom.xml 2009-04-28 14:13:01 UTC (rev 87946) +++ projects/jboss-osgi/bundles/pom.xml 2009-04-28 14:54:51 UTC (rev 87947) @@ -4,7 +4,7 @@ <name>JBossOSGi - Bundles</name> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-bundles-parent</artifactId> + <artifactId>jboss-bundles</artifactId> <packaging>pom</packaging> <version>1.0.0</version>