[jboss-osgi-commits] JBoss-OSGI SVN: r87965 - in projects/jboss-osgi/bundles: apache-xerces and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-28 19:10:47 -0400 (Tue, 28 Apr 2009) New Revision: 87965 Added: projects/jboss-osgi/bundles/jboss-common-core/ projects/jboss-osgi/bundles/jboss-common-core/pom.xml Removed: projects/jboss-osgi/bundles/apache-xerces/.project projects/jboss-osgi/bundles/jbossxb/.project Modified: projects/jboss-osgi/bundles/apache-xerces/pom.xml projects/jboss-osgi/bundles/jbossxb/pom.xml projects/jboss-osgi/bundles/pom.xml Log: Add common-core Deleted: projects/jboss-osgi/bundles/apache-xerces/.project =================================================================== --- projects/jboss-osgi/bundles/apache-xerces/.project 2009-04-28 20:08:19 UTC (rev 87964) +++ projects/jboss-osgi/bundles/apache-xerces/.project 2009-04-28 23:10:47 UTC (rev 87965) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>apache-xerces</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value>&lt;project&gt;/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value> - </dictionary> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> Modified: projects/jboss-osgi/bundles/apache-xerces/pom.xml =================================================================== --- projects/jboss-osgi/bundles/apache-xerces/pom.xml 2009-04-28 20:08:19 UTC (rev 87964) +++ projects/jboss-osgi/bundles/apache-xerces/pom.xml 2009-04-28 23:10:47 UTC (rev 87965) @@ -18,6 +18,7 @@ <properties> <version.apache.xerces>2.9.1</version.apache.xerces> <version.wutka.dtdparser>1.2.1</version.wutka.dtdparser> + <version.xml.resolver>1.2</version.xml.resolver> </properties> <dependencies> @@ -36,6 +37,11 @@ <artifactId>dtdparser121</artifactId> <version>${version.wutka.dtdparser}</version> </dependency> + <dependency> + <groupId>xml-resolver</groupId> + <artifactId>xml-resolver</artifactId> + <version>${version.xml.resolver}</version> + </dependency> </dependencies> <build> @@ -53,7 +59,15 @@ </executions> <configuration> <instructions> - <Embed-Dependency>*;inline=false</Embed-Dependency> + <Import-Package> + !sun.io + </Import-Package> + <Embed-Dependency> + dtdparser121;inline=false, + xercesImpl;inline=false, + xml-apis;inline=false, + xml-resolver;inline=false, + </Embed-Dependency> <_exportcontents>*</_exportcontents> </instructions> </configuration> Property changes on: projects/jboss-osgi/bundles/jboss-common-core ___________________________________________________________________ Name: svn:ignore + target Added: projects/jboss-osgi/bundles/jboss-common-core/pom.xml =================================================================== --- projects/jboss-osgi/bundles/jboss-common-core/pom.xml (rev 0) +++ projects/jboss-osgi/bundles/jboss-common-core/pom.xml 2009-04-28 23:10:47 UTC (rev 87965) @@ -0,0 +1,66 @@ +<?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 Common Core</name> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-common-core-bundle</artifactId> + <packaging>bundle</packaging> + + <version>2.2.11-SNAPSHOT</version> + + <parent> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-bundles</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + + <properties> + <version.jboss.common.core>2.2.11.GA</version.jboss.common.core> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>${version.jboss.common.core}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> + <Import-Package> + <!--system --> + javax.naming*, + javax.net*, + javax.xml.namespace, + javax.xml.parsers, + javax.xml.transform*, + org.w3c.dom, + org.xml.sax*, + + <!-- import --> + org.jboss.logging, + + <!-- ignore --> + !org.apache.commons.httpclient, + !org.apache.webdav.lib, + </Import-Package> + <Embed-Transitive>true</Embed-Transitive> + <Embed-Dependency> + jboss-common-core;inline=false, + </Embed-Dependency> + <_exportcontents>*</_exportcontents> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + +</project> Property changes on: projects/jboss-osgi/bundles/jboss-common-core/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: projects/jboss-osgi/bundles/jbossxb/.project =================================================================== --- projects/jboss-osgi/bundles/jbossxb/.project 2009-04-28 20:08:19 UTC (rev 87964) +++ projects/jboss-osgi/bundles/jbossxb/.project 2009-04-28 23:10:47 UTC (rev 87965) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jbossxb</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> Modified: projects/jboss-osgi/bundles/jbossxb/pom.xml =================================================================== --- projects/jboss-osgi/bundles/jbossxb/pom.xml 2009-04-28 20:08:19 UTC (rev 87964) +++ projects/jboss-osgi/bundles/jbossxb/pom.xml 2009-04-28 23:10:47 UTC (rev 87965) @@ -17,7 +17,7 @@ <properties> <version.jboss.xb>2.0.0.GA</version.jboss.xb> - <version.apache.xerces>2.9.1-SNAPSHOT</version.apache.xerces> + <version.javasisst>3.9.0.GA</version.javasisst> </properties> <dependencies> @@ -27,9 +27,9 @@ <version>${version.jboss.xb}</version> </dependency> <dependency> - <groupId>org.jboss.osgi.bundles.apache</groupId> - <artifactId>apache-xerces</artifactId> - <version>${version.apache.xerces}</version> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>${version.javasisst}</version> </dependency> </dependencies> @@ -41,8 +41,32 @@ <configuration> <instructions> <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> - <Embed-Dependency>jbossxb;inline=false</Embed-Dependency> - <_exportcontents>*;version=${version.jboss.xb}</_exportcontents> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package> + <!-- system --> + javax.activation, + javax.xml.bind.*, + javax.xml.namespace, + javax.xml.parsers, + org.w3c.dom*, + org.xml.sax*, + + <!-- import --> + com.wutka.dtd, + javassist*, + org.apache.xerces.*, + org.jboss.logging, + org.jboss.util*, + + <!-- ignore --> + !com.sun.jdi* + </Import-Package> + <Embed-Dependency> + javassist;inline=false, + jbossxb;inline=false, + jboss-reflect;inline=false, + </Embed-Dependency> + <_exportcontents>*</_exportcontents> </instructions> </configuration> </plugin> Modified: projects/jboss-osgi/bundles/pom.xml =================================================================== --- projects/jboss-osgi/bundles/pom.xml 2009-04-28 20:08:19 UTC (rev 87964) +++ projects/jboss-osgi/bundles/pom.xml 2009-04-28 23:10:47 UTC (rev 87965) @@ -16,6 +16,7 @@ <!-- Modules --> <modules> <module>apache-xerces</module> + <module>jboss-common-core</module> <module>jbossxb</module> </modules>