JBoss-OSGI SVN: r95301 - in projects/jboss-osgi: projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-21 10:20:36 -0400 (Wed, 21 Oct 2009)
New Revision: 95301
Modified:
projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkIntegration.java
projects/jboss-osgi/trunk/pom.xml
Log:
Upgrade equinox integration
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-10-21 14:17:01 UTC (rev 95300)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-10-21 14:20:36 UTC (rev 95301)
@@ -20,19 +20,26 @@
<artifactId>jboss-osgi-runtime-equinox</artifactId>
<packaging>jar</packaging>
- <version>3.6-SNAPSHOT</version>
+ <version>3.5-SNAPSHOT</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.4-SNAPSHOT</version>
</parent>
+ <!-- Subversion -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
+ <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
+ </scm>
+
<!-- Properties -->
<properties>
<version.eclipse.equinox>3.5</version.eclipse.equinox>
- <version.jboss.osgi.spi>1.0.1</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
</properties>
<!-- Dependencies -->
@@ -52,25 +59,28 @@
<artifactId>org.eclipse.osgi.services</artifactId>
<version>${version.eclipse.equinox}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Build -->
<build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
<plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
</build>
- <!-- Subversion -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi/projects/runtime/equinox/trunk</url>
- </scm>
-
</project>
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java 2009-10-21 14:17:01 UTC (rev 95300)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java 2009-10-21 14:20:36 UTC (rev 95301)
@@ -23,9 +23,12 @@
//$Id: FelixIntegration.java 91762 2009-07-29 12:14:37Z thomas.diesler(a)jboss.com $
+import java.util.Map;
+
import org.jboss.logging.Logger;
import org.jboss.osgi.spi.framework.FrameworkIntegration;
import org.jboss.osgi.spi.util.ServiceLoader;
+import org.osgi.framework.launch.Framework;
import org.osgi.framework.launch.FrameworkFactory;
/**
@@ -38,15 +41,17 @@
{
// Provide logging
final Logger log = Logger.getLogger(EquinoxIntegration.class);
-
- public void create()
+
+ @Override
+ protected Framework createFramework(Map<String, Object> properties)
{
// Log INFO about this implementation
- log.info(getClass().getPackage().getImplementationTitle());
- log.info(getClass().getPackage().getImplementationVersion());
+ String implTitle = getClass().getPackage().getImplementationTitle();
+ String impVersion = getClass().getPackage().getImplementationVersion();
+ log.info(implTitle + " - " + impVersion);
// Load the framework instance
FrameworkFactory factory = ServiceLoader.loadService(FrameworkFactory.class);
- framework = factory.newFramework(properties);
+ return factory.newFramework(properties);
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java 2009-10-21 14:17:01 UTC (rev 95300)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java 2009-10-21 14:20:36 UTC (rev 95301)
@@ -43,14 +43,13 @@
// Provide logging
final Logger log = Logger.getLogger(FelixIntegration.class);
- private Framework framework;
-
@Override
- protected void createFramework(Map<String, Object> properties)
+ protected Framework createFramework(Map<String, Object> properties)
{
// Log INFO about this implementation
- log.info(getClass().getPackage().getImplementationTitle());
- log.info(getClass().getPackage().getImplementationVersion());
+ String implTitle = getClass().getPackage().getImplementationTitle();
+ String impVersion = getClass().getPackage().getImplementationVersion();
+ log.info(implTitle + " - " + impVersion);
// When a Felix instance is embedded in a host application,
// the host application must inform the Felix instance that it is embedded
@@ -61,18 +60,12 @@
// Load the framework instance
FrameworkFactory factory = ServiceLoader.loadService(FrameworkFactory.class);
- framework = factory.newFramework(properties);
+ return factory.newFramework(properties);
}
- @Override
- protected Framework getFramework()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
public void stop()
{
+ final Framework framework = getFramework();
if (framework != null)
{
// Running the Felix shutdown in a separate thread that gets
@@ -88,7 +81,6 @@
{
framework.stop();
framework.waitForStop(5000);
- framework = null;
log.debug("SystemBundle STOPPED");
}
catch (BundleException ex)
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkIntegration.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkIntegration.java 2009-10-21 14:17:01 UTC (rev 95300)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkIntegration.java 2009-10-21 14:20:36 UTC (rev 95301)
@@ -56,6 +56,8 @@
private List<URL> autoInstall = new ArrayList<URL>();
private List<URL> autoStart = new ArrayList<URL>();
+ private Framework framework;
+
public Map<String, Object> getProperties()
{
return properties;
@@ -86,12 +88,6 @@
this.autoStart = autoStart;
}
- /** Overwrite to create the framework */
- protected abstract void createFramework(Map<String, Object> properties);
-
- /** Overwrite to provide the framework */
- protected abstract Framework getFramework();
-
public Bundle getBundle()
{
assertFrameworkStart();
@@ -104,11 +100,23 @@
return getFramework().getBundleContext();
}
+ public Framework getFramework()
+ {
+ if (framework == null)
+ framework = createFramework(properties);
+
+ return framework;
+ }
+
public void create()
{
- createFramework(properties);
+ if (framework == null)
+ framework = createFramework(properties);
}
+ /** Overwrite to create the framework */
+ protected abstract Framework createFramework(Map<String, Object> properties);
+
public void start()
{
// Create the Framework instance
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-10-21 14:17:01 UTC (rev 95300)
+++ projects/jboss-osgi/trunk/pom.xml 2009-10-21 14:20:36 UTC (rev 95301)
@@ -63,7 +63,7 @@
<version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi>
<version.jboss.osgi.microcontainer>1.0.3-SNAPSHOT</version.jboss.osgi.microcontainer>
<version.jboss.osgi.runtime.deployers>1.0.2</version.jboss.osgi.runtime.deployers>
- <version.jboss.osgi.runtime.equinox>3.5</version.jboss.osgi.runtime.equinox>
+ <version.jboss.osgi.runtime.equinox>3.5-SNAPSHOT</version.jboss.osgi.runtime.equinox>
<version.jboss.osgi.runtime.felix>2.0.1-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.runtime.jbossas>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.jbossas>
<version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
16 years, 2 months
JBoss-OSGI SVN: r95295 - projects/jboss-osgi/trunk/distribution.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-21 09:43:00 -0400 (Wed, 21 Oct 2009)
New Revision: 95295
Modified:
projects/jboss-osgi/trunk/distribution/pom.xml
Log:
Add deployment sources + javadoc
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-21 13:42:25 UTC (rev 95294)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-21 13:43:00 UTC (rev 95295)
@@ -140,6 +140,22 @@
<!-- jboss-osgi-common-core: no javadoc -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-deployment</artifactId>
+ <version>${version.jboss.osgi.deployment}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-deployment</artifactId>
+ <version>${version.jboss.osgi.deployment}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-hotdeploy</artifactId>
</dependency>
<dependency>
16 years, 2 months
JBoss-OSGI SVN: r95292 - projects/jboss-osgi/trunk/distribution.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-21 09:27:41 -0400 (Wed, 21 Oct 2009)
New Revision: 95292
Modified:
projects/jboss-osgi/trunk/distribution/pom.xml
Log:
Fix typo
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-21 13:25:51 UTC (rev 95291)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-21 13:27:41 UTC (rev 95292)
@@ -236,13 +236,13 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-webapp</artifactId>
- <version>${version.jboss.osgi.xml.binding}</version>
+ <version>${version.jboss.osgi.webapp}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-webapp</artifactId>
- <version>${version.jboss.osgi.xml.binding}</version>
+ <version>${version.jboss.osgi.webapp}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
16 years, 2 months
JBoss-OSGI SVN: r95291 - in projects/jboss-osgi: trunk and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-21 09:25:51 -0400 (Wed, 21 Oct 2009)
New Revision: 95291
Modified:
projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
Log:
Upgrade to pax-web-0.7.1
Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2009-10-21 13:18:58 UTC (rev 95290)
+++ projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2009-10-21 13:25:51 UTC (rev 95291)
@@ -21,7 +21,7 @@
<artifactId>jboss-osgi-webapp</artifactId>
<packaging>bundle</packaging>
- <version>0.7.0-SNAPSHOT</version>
+ <version>0.7.1-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -40,23 +40,13 @@
<!-- Properties -->
<properties>
<version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment>
- <version.ops4j.pax.base>1.2.1</version.ops4j.pax.base>
- <version.ops4j.pax.web>0.7.0</version.ops4j.pax.web>
+ <version.ops4j.pax.web>0.7.1</version.ops4j.pax.web>
<version.osgi>4.2.0</version.osgi>
</properties>
<!-- Dependencies -->
<dependencies>
<dependency>
- <!--
- [TODO] Invalid maven dependency on pax base
- http://issues.ops4j.org/browse/PAXWEB-177
- -->
- <groupId>org.ops4j.base</groupId>
- <artifactId>ops4j-base-util-xml</artifactId>
- <version>${version.ops4j.pax.base}</version>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-api</artifactId>
<version>${version.ops4j.pax.web}</version>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-10-21 13:18:58 UTC (rev 95290)
+++ projects/jboss-osgi/trunk/pom.xml 2009-10-21 13:25:51 UTC (rev 95291)
@@ -67,10 +67,10 @@
<version.jboss.osgi.runtime.felix>2.0.1-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.runtime.jbossas>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.jbossas>
<version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.osgi.webapp>0.7.0-SNAPSHOT</version.jboss.osgi.webapp>
+ <version.jboss.osgi.webapp>0.7.1-SNAPSHOT</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
- <version.ops4j.pax.web>0.7.0</version.ops4j.pax.web>
+ <version.ops4j.pax.web>0.7.1</version.ops4j.pax.web>
<version.osgi>4.2.0</version.osgi>
</properties>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-21 13:18:58 UTC (rev 95290)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-21 13:25:51 UTC (rev 95291)
@@ -89,14 +89,14 @@
{
URL url = new URL("http://" + runtime.getServerHost() + ":8090/example-webapp" + reqPath);
- int timeout = 50;
+ int timeout = 40;
String line = null;
IOException lastException = null;
while (line == null && 0 < timeout--)
{
+ Thread.sleep(500);
try
{
- Thread.sleep(200);
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
line = br.readLine();
}
16 years, 2 months
JBoss-OSGI SVN: r95289 - in projects/jboss-osgi/trunk/distribution: installer/src/main/resources/installer and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-21 09:01:53 -0400 (Wed, 21 Oct 2009)
New Revision: 95289
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/pom.xml
Log:
Add javadoc and sources to distro
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-21 12:58:30 UTC (rev 95288)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-21 13:01:53 UTC (rev 95289)
@@ -133,14 +133,13 @@
<!-- JBossOSGi Source -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/source" override="true">
- <include name="jboss-common-core-sources.jar" />
- <include name="jboss-logging-log4j-sources.jar" />
- <include name="jboss-logging-spi-sources.jar" />
<include name="jboss-osgi-apache-xerces-sources.jar" />
<include name="jboss-osgi-blueprint-sources.jar" />
<include name="jboss-osgi-common-core-sources.jar" />
<include name="jboss-osgi-common-sources.jar" />
+ <include name="jboss-osgi-deployment-sources.jar" />
<include name="jboss-osgi-deployers-sources.jar" />
+ <include name="jboss-osgi-framework-sources.jar" />
<include name="jboss-osgi-hotdeploy-sources.jar" />
<include name="jboss-osgi-husky-harness-sources.jar" />
<include name="jboss-osgi-jaxb-sources.jar" />
@@ -152,6 +151,7 @@
<include name="jboss-osgi-runtime-jbossas-sources.jar" />
<include name="jboss-osgi-framework-sources.jar" />
<include name="jboss-osgi-spi-sources.jar" />
+ <include name="jboss-osgi-webapp-sources.jar" />
<include name="jboss-osgi-webconsole-sources.jar" />
<include name="jboss-osgi-xml-binding-sources.jar" />
</fileset>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-21 12:58:30 UTC (rev 95288)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-21 13:01:53 UTC (rev 95289)
@@ -231,32 +231,38 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-webconsole</artifactId>
+ <artifactId>jboss-osgi-webapp</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-webconsole</artifactId>
- <version>${version.jboss.osgi.webconsole}</version>
+ <artifactId>jboss-osgi-webapp</artifactId>
+ <version>${version.jboss.osgi.xml.binding}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-webconsole</artifactId>
- <version>${version.jboss.osgi.webconsole}</version>
+ <artifactId>jboss-osgi-webapp</artifactId>
+ <version>${version.jboss.osgi.xml.binding}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-webapp</artifactId>
+ <artifactId>jboss-osgi-webconsole</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-webapp</artifactId>
- <version>${version.jboss.osgi.xml.binding}</version>
+ <artifactId>jboss-osgi-webconsole</artifactId>
+ <version>${version.jboss.osgi.webconsole}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webconsole</artifactId>
+ <version>${version.jboss.osgi.webconsole}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
</dependency>
<dependency>
16 years, 2 months
JBoss-OSGI SVN: r95288 - in projects/jboss-osgi/trunk: distribution and 8 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-21 08:58:30 -0400 (Wed, 21 Oct 2009)
New Revision: 95288
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/common/Deployment.java
projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java
projects/jboss-osgi/trunk/testsuite/example/pom.xml
projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Replace pax-web-extender-war with jboss-osgi-webapp
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -218,8 +218,8 @@
<include name="jboss-osgi-jmx.jar" />
<include name="jboss-osgi-jndi.jar" />
<!-- web -->
+ <include name="jboss-osgi-webapp.jar" />
<include name="jboss-osgi-webconsole.jar" />
- <include name="pax-web-extender-war.jar" />
<include name="pax-web-jetty-bundle.jar" />
</fileset>
@@ -231,8 +231,8 @@
<include name="jboss-osgi-jmx.jar" />
<include name="jboss-osgi-jndi.jar" />
<!-- web -->
+ <include name="jboss-osgi-webapp.jar" />
<include name="jboss-osgi-webconsole.jar" />
- <include name="pax-web-extender-war.jar" />
<include name="pax-web-jetty-bundle.jar" />
<!-- all -->
<include name="jboss-osgi-apache-xerces.jar" />
@@ -374,9 +374,9 @@
<include name="jboss-osgi-jaxb.jar" />
<include name="jboss-osgi-jmx.jar" />
<include name="jboss-osgi-jndi.jar" />
+ <include name="jboss-osgi-webapp.jar" />
<include name="jboss-osgi-webconsole.jar" />
<include name="jboss-osgi-xml-binding.jar" />
- <include name="pax-web-extender-war.jar" />
<include name="pax-web-jetty-bundle.jar" />
<include name="org.apache.felix.log.jar" />
</fileset>
Modified: projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -15,6 +15,7 @@
<include>*:jboss-osgi-apache-xerces:jar:sources</include>
<include>*:jboss-osgi-blueprint:jar:sources</include>
<include>*:jboss-osgi-common:jar:sources</include>
+ <include>*:jboss-osgi-deployment:jar:sources</include>
<include>*:jboss-osgi-hotdeploy:jar:sources</include>
<include>*:jboss-osgi-husky:jar:sources</include>
<include>*:jboss-osgi-jaxb:jar:sources</include>
@@ -22,6 +23,7 @@
<include>*:jboss-osgi-jndi:jar:sources</include>
<include>*:jboss-osgi-microcontainer:jar:sources</include>
<include>*:jboss-osgi-spi:jar:sources</include>
+ <include>*:jboss-osgi-webapp:jar:sources</include>
<include>*:jboss-osgi-xml-binding:jar:sources</include>
</includes>
<unpack>true</unpack>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -247,6 +247,16 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webapp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webapp</artifactId>
+ <version>${version.jboss.osgi.xml.binding}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
</dependency>
<dependency>
@@ -332,12 +342,10 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
+
+ <!-- OPS4J -->
<dependency>
<groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-extender-war</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
</dependency>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/pom.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -70,7 +70,6 @@
<version.jboss.osgi.webapp>0.7.0-SNAPSHOT</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
- <version.ops4j.pax.base>1.2.1</version.ops4j.pax.base>
<version.ops4j.pax.web>0.7.0</version.ops4j.pax.web>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -230,21 +229,7 @@
<!-- OPS4J -->
<dependency>
- <!--
- [TODO] Invalid maven dependency on pax base
- http://issues.ops4j.org/browse/PAXWEB-177
- -->
- <groupId>org.ops4j.base</groupId>
- <artifactId>ops4j-base-util-xml</artifactId>
- <version>${version.ops4j.pax.base}</version>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-extender-war</artifactId>
- <version>${version.ops4j.pax.web}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
<version>${version.ops4j.pax.web}</version>
</dependency>
Modified: projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/common/Deployment.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/common/Deployment.java 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/common/Deployment.java 2009-10-21 12:58:30 UTC (rev 95288)
@@ -57,6 +57,11 @@
public String getVersion();
/**
+ * Get the manifest header for the given key.
+ */
+ public String getManifestHeader(String key);
+
+ /**
* Get the start level associated with this deployment
*/
public int getStartLevel();
Modified: projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java 2009-10-21 12:58:30 UTC (rev 95288)
@@ -96,6 +96,14 @@
}
/**
+ * Get the manifest header for the given key.
+ */
+ public String getManifestHeader(String key)
+ {
+ return info.getManifestHeader(key);
+ }
+
+ /**
* Get the start level associated with this deployment
*/
public int getStartLevel()
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -237,6 +237,7 @@
<configuration>
<excludes>
<exclude>${target.container.excludes}</exclude>
+ <exclude>org/jboss/test/osgi/example/webapp/**</exclude>
</excludes>
</configuration>
</plugin>
Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -30,7 +30,6 @@
<include>*:org.apache.felix.configadmin:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.apache.felix.metatype:jar</include>
- <include>*:pax-web-extender-war:jar</include>
<include>*:pax-web-jetty-bundle:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-21 12:58:30 UTC (rev 95288)
@@ -30,11 +30,11 @@
import java.io.InputStreamReader;
import java.net.URL;
-import org.jboss.osgi.spi.capability.WebAppCapability;
import org.jboss.osgi.spi.testing.OSGiBundle;
import org.jboss.osgi.spi.testing.OSGiRuntime;
import org.jboss.osgi.spi.testing.OSGiTest;
import org.jboss.osgi.spi.testing.OSGiTestHelper;
+import org.jboss.osgi.webapp.WebAppCapability;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -96,13 +96,13 @@
{
try
{
+ Thread.sleep(200);
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
line = br.readLine();
}
catch (IOException ex)
{
lastException = ex;
- Thread.sleep(200);
}
}
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -134,22 +134,12 @@
<scope>provided</scope>
</dependency>
- <!-- Ops4J -->
+ <!-- OPS4J -->
<dependency>
- <groupId>org.ops4j.base</groupId>
- <artifactId>ops4j-base-util-xml</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-extender-war</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Test Dependencies -->
<dependency>
16 years, 2 months
JBoss-OSGI SVN: r95287 - in projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp: internal and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-21 08:56:10 -0400 (Wed, 21 Oct 2009)
New Revision: 95287
Added:
projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppService.java
Modified:
projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppCapability.java
projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppActivator.java
Log:
Add marker service
Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppCapability.java 2009-10-21 12:50:30 UTC (rev 95286)
+++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppCapability.java 2009-10-21 12:56:10 UTC (rev 95287)
@@ -41,7 +41,7 @@
{
public WebAppCapability()
{
- super(null);
+ super(WebAppService.class.getName());
addDependency(new HttpServiceCapability());
Added: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppService.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppService.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppService.java 2009-10-21 12:56:10 UTC (rev 95287)
@@ -0,0 +1,34 @@
+/*
+ * 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.webapp;
+
+//$Id$
+
+/**
+ * A marker service that is registered by jboss-osgi-webapp
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 21-Oct-2009
+ */
+public interface WebAppService
+{
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppActivator.java 2009-10-21 12:50:30 UTC (rev 95286)
+++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppActivator.java 2009-10-21 12:56:10 UTC (rev 95287)
@@ -23,6 +23,7 @@
//$Id$
+import org.jboss.osgi.webapp.WebAppService;
import org.ops4j.pax.web.extender.war.internal.WebAppPublisherExt;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -35,18 +36,21 @@
*/
public class WebAppActivator implements BundleActivator
{
- private WebAppPublisherExt paxwebPublisher;
private WebXMLParserInterceptor webappParserInterceptor;
private WebAppPublisherInterceptor webappPublishInterceptor;
public void start(BundleContext context)
{
- paxwebPublisher = new WebAppPublisherExt();
+ // Register the marker service
+ WebAppService service = new WebAppService() {};
+ context.registerService(WebAppService.class.getName(), service, null);
+ // Register the web.xml parser interceptor
webappParserInterceptor = new WebXMLParserInterceptor(context);
webappParserInterceptor.start();
- webappPublishInterceptor = new WebAppPublisherInterceptor(context, paxwebPublisher);
+ // Register the WebApp publisher interceptor
+ webappPublishInterceptor = new WebAppPublisherInterceptor(context, new WebAppPublisherExt());
webappPublishInterceptor.start();
}
16 years, 2 months
JBoss-OSGI SVN: r95285 - projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-21 08:50:17 -0400 (Wed, 21 Oct 2009)
New Revision: 95285
Modified:
projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppCapability.java
Log:
Fix javadoc
Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppCapability.java 2009-10-21 12:49:22 UTC (rev 95284)
+++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/WebAppCapability.java 2009-10-21 12:50:17 UTC (rev 95285)
@@ -32,7 +32,7 @@
* under test.
*
* Dependent Capability: {@link HttpServiceCapability}
- * Installed bundles: pax-web-extender-war.jar
+ * Installed bundles: jboss-osgi-webapp.jar
*
* @author thomas.diesler(a)jboss.com
* @since 07-Oct-2009
16 years, 2 months
JBoss-OSGI SVN: r95284 - projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-21 08:49:22 -0400 (Wed, 21 Oct 2009)
New Revision: 95284
Removed:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/WebAppCapability.java
Log:
Move WebAppCapability to jboss-osgi-webapp
Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/WebAppCapability.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/WebAppCapability.java 2009-10-21 12:48:57 UTC (rev 95283)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/WebAppCapability.java 2009-10-21 12:49:22 UTC (rev 95284)
@@ -1,48 +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.spi.capability;
-
-//$Id: $
-
-import org.jboss.osgi.spi.testing.OSGiRuntime;
-
-/**
- * Adds the WebApp (WAR) capability to the {@link OSGiRuntime}
- * under test.
- *
- * Dependent Capability: {@link HttpServiceCapability}
- * Installed bundles: pax-web-extender-war.jar
- *
- * @author thomas.diesler(a)jboss.com
- * @since 07-Oct-2009
- */
-public class WebAppCapability extends Capability
-{
- public WebAppCapability()
- {
- super(null);
-
- addDependency(new HttpServiceCapability());
-
- addBundle("bundles/pax-web-extender-war.jar");
- }
-}
\ No newline at end of file
16 years, 2 months