[jboss-cvs] JBossAS SVN: r97110 - in projects/jboss-osgi/projects/bundles: jboss-reflect and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 27 09:45:31 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-11-27 09:45:30 -0500 (Fri, 27 Nov 2009)
New Revision: 97110
Added:
projects/jboss-osgi/projects/bundles/jboss-reflect/
projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/
projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/src/main/java/org/jboss/osgi/reflect/
Removed:
projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/scripts/
projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/src/main/java/org/jboss/osgi/jbossxb/UnmarshallerService.java
projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java
projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/
projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/src/main/resources/
projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/src/test/java/
projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/src/test/resources/
Modified:
projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/.classpath
projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/pom.xml
Log:
Add jboss-osgi-reflect
Copied: projects/jboss-osgi/projects/bundles/jboss-reflect/trunk (from rev 97108, projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk)
Modified: projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/.classpath 2009-11-27 14:07:53 UTC (rev 97108)
+++ projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/.classpath 2009-11-27 14:45:30 UTC (rev 97110)
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
<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"/>
Modified: projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-11-27 14:07:53 UTC (rev 97108)
+++ projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/pom.xml 2009-11-27 14:45:30 UTC (rev 97110)
@@ -14,11 +14,11 @@
<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 - JBossXB</name>
- <description>A JBossOSGi provided JBossXB bundle</description>
+ <name>JBossOSGi Bundles - JBoss Reflect</name>
+ <description>A JBossOSGi provided JBoss Reflect bundle</description>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-xml-binding</artifactId>
+ <artifactId>jboss-osgi-reflect</artifactId>
<packaging>bundle</packaging>
<version>2.0.2-SNAPSHOT</version>
@@ -32,23 +32,14 @@
<!-- Subversion -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jboss-reflect/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jboss-reflect/trunk</developerConnection>
<url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
</scm>
<!-- Properties -->
<properties>
- <version.jboss.osgi.runtime.felix>2.0.2-SNAPSHOT</version.jboss.osgi.runtime.felix>
- <version.jboss.xb>2.0.2.Beta3</version.jboss.xb>
- <version.javassist>3.9.0.GA</version.javassist>
- <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
- <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
- <version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky>
- <version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb>
- <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.reflect>2.0.2.GA</version.jboss.reflect>
- <version.osgi>4.2.0</version.osgi>
</properties>
<!-- Dependencies -->
@@ -58,83 +49,10 @@
<artifactId>bnd</artifactId>
</dependency>
<dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${version.javassist}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>${version.jboss.xb}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>jboss-reflect</artifactId>
+ <version>${version.jboss.reflect}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <!-- Provided Dependencies -->
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</artifactId>
- <version>${version.jboss.osgi.common.core}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky</artifactId>
- <version>${version.jboss.osgi.husky}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jaxb</artifactId>
- <version>${version.jboss.osgi.jaxb}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- OSGi Dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version.jboss.osgi.runtime.felix}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -145,40 +63,9 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.jbossxb.internal.XMLBindingActivator</Bundle-Activator>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Embed-Transitive>true</Embed-Transitive>
- <Export-Package>
- org.jboss.osgi.jbossxb;version=${version}
- </Export-Package>
- <Import-Package>
- <!-- system -->
- javax.activation,
- javax.xml.bind.*,
- javax.xml.namespace,
- javax.xml.parsers,
- org.slf4j,
- org.w3c.dom*,
- org.xml.sax*,
-
- <!-- import -->
- com.wutka.dtd,
- org.apache.xerces.*,
- org.jboss.logging,
- org.jboss.osgi.jaxb;version="[2.1,2.2)",
- org.jboss.osgi.spi.capability;version="[1.0,1.1)",
- org.jboss.osgi.spi.util;version="[1.0,1.1)",
- org.jboss.util*,
- org.osgi.framework,
- org.osgi.service.log,
- org.osgi.util.tracker,
-
- <!-- ignore -->
- !com.sun.jdi*
- </Import-Package>
<Embed-Dependency>
- javassist;inline=false,
- jbossxb;inline=false,
jboss-reflect;inline=false,
</Embed-Dependency>
<_exportcontents>
@@ -188,113 +75,11 @@
org.jboss.joinpoint*;version=${version.jboss.reflect},
org.jboss.reflect.plugins.introspection;version=${version.jboss.reflect},
org.jboss.reflect.spi*;version=${version.jboss.reflect},
- org.jboss.xb.annotations;version=${version.jboss.xb},
- org.jboss.xb.binding.sunday.unmarshalling;version=${version.jboss.xb},
- org.jboss.xb.binding;version=${version.jboss.xb},
</_exportcontents>
</instructions>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>bundles</id>
- <phase>test-compile</phase>
- <goals>
- <goal>directory-single</goal>
- </goals>
- <configuration>
- <finalName>test-libs</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-bundles.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>build-test-jars</id>
- <phase>integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
- <property name="artifactId" value="${artifactId}" />
- <property name="tests.output.dir" value="${project.build.directory}" />
- <property name="build.artifact" value="${project.build.finalName}" />
- <ant antfile="scripts/antrun-test-jars.xml" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-integration-tests</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <argLine>${surefire.jpda.args}</argLine>
- <systemProperties>
- <property>
- <name>java.protocol.handler.pkgs</name>
- <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
- </property>
- <property>
- <name>log4j.output.dir</name>
- <value>${project.build.directory}</value>
- </property>
- <property>
- <name>org.jboss.osgi.husky.Invoker</name>
- <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
- </property>
- <property>
- <name>test.archive.directory</name>
- <value>${project.build.directory}/test-libs</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
- <!-- Profiles -->
- <profiles>
-
- <!--
- Name: jpda
- Descr: Enable JPDA remote debuging
- -->
- <profile>
- <id>jpda</id>
- <activation>
- <property>
- <name>jpda</name>
- </property>
- </activation>
- <properties>
- <surefire.jpda.args>-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</surefire.jpda.args>
- </properties>
- </profile>
-
- </profiles>
-
</project>
Deleted: projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/src/main/java/org/jboss/osgi/jbossxb/UnmarshallerService.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/UnmarshallerService.java 2009-11-27 14:07:53 UTC (rev 97108)
+++ projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/src/main/java/org/jboss/osgi/jbossxb/UnmarshallerService.java 2009-11-27 14:45:30 UTC (rev 97110)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.jbossxb;
-
-//$Id$
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-
-/**
- * An unmarshaller service
- *
- * @author thomas.diesler at jboss.com
- * @since 26-Nov-2009
- */
-public interface UnmarshallerService
-{
- void setFeature(String featureName, Boolean flag);
-
- void setValidation(boolean validation);
-
- void setNamespaceAware(boolean namespaces);
-
- void setSchemaValidation(boolean validation);
-
- void setErrorHandler(ErrorHandler errorHandler);
-
- void registerSchemaLocation(String id, String dtdOrSchema);
-
- void addClassBinding(String nsUri, String className);
-
- void addClassBinding(String nsUri, Class<?> clazz);
-
- Object unmarshal(Reader xmlReader) throws IOException;
-
- Object unmarshal(InputStream xmlStream) throws IOException;
-
- Object unmarshal(InputSource source) throws IOException;
-
- Object unmarshal(String xml) throws IOException;
-}
\ No newline at end of file
Deleted: projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java 2009-11-27 14:07:53 UTC (rev 97108)
+++ projects/jboss-osgi/projects/bundles/jboss-reflect/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java 2009-11-27 14:45:30 UTC (rev 97110)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.jbossxb;
-
-//$Id$
-
-import org.jboss.osgi.jaxb.JAXBCapability;
-import org.jboss.osgi.spi.capability.Capability;
-
-/**
- * Adds the JBossXB capability.
- *
- * It is ignored if the {@link UnmarshallerService} is already registered.
- *
- * Dependent capabilities: {@link JAXBCapability}.
- *
- * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-xml-binding.jar
- *
- * @author thomas.diesler at jboss.com
- * @since 05-May-2009
- */
-public class XMLBindingCapability extends Capability
-{
- public XMLBindingCapability()
- {
- super (UnmarshallerService.class.getName());
-
- addDependency(new JAXBCapability());
-
- addBundle("bundles/jboss-osgi-common-core.jar");
- addBundle("bundles/jboss-osgi-xml-binding.jar");
- }
-}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list