JBoss-OSGI SVN: r94735 - in projects/jboss-osgi/projects/parent/tags: jboss-osgi-spi-1.0.2 and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-13 02:29:23 -0400 (Tue, 13 Oct 2009)
New Revision: 94735
Added:
projects/jboss-osgi/projects/parent/tags/jboss-osgi-spi-1.0.2/
projects/jboss-osgi/projects/parent/tags/jboss-osgi-spi-1.0.2/pom.xml
Removed:
projects/jboss-osgi/projects/parent/tags/jboss-osgi-spi-1.0.2/pom.xml
Log:
[maven-release-plugin] copy for tag jboss-osgi-spi-1.0.2
Copied: projects/jboss-osgi/projects/parent/tags/jboss-osgi-spi-1.0.2 (from rev 94732, projects/jboss-osgi/projects/spi/trunk)
Property changes on: projects/jboss-osgi/projects/parent/tags/jboss-osgi-spi-1.0.2
___________________________________________________________________
Name: svn:ignore
+ target
Name: svn:mergeinfo
+
Deleted: projects/jboss-osgi/projects/parent/tags/jboss-osgi-spi-1.0.2/pom.xml
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-10-13 06:21:40 UTC (rev 94732)
+++ projects/jboss-osgi/projects/parent/tags/jboss-osgi-spi-1.0.2/pom.xml 2009-10-13 06:29:23 UTC (rev 94735)
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, the OpenSource J2EE webOS -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- -->
- <!-- ====================================================================== -->
-
- <!-- $Id$ -->
-
-<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 SPI</name>
-
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <packaging>jar</packaging>
-
- <version>1.0.2-SNAPSHOT</version>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.2</version>
- </parent>
-
- <!-- Properties -->
- <properties>
- <version.args4j>2.0.12</version.args4j>
- <version.jboss.logging>2.0.5.GA</version.jboss.logging>
- <version.jboss.vfs>2.1.3.GA</version.jboss.vfs>
- <version.osgi>r4v42</version.osgi>
- </properties>
-
- <!-- Dependencies -->
- <dependencies>
-
- <!-- Compile Dependencies -->
- <dependency>
- <groupId>args4j</groupId>
- <artifactId>args4j</artifactId>
- <version>${version.args4j}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>${version.jboss.vfs}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- </dependency>
-
- <!-- Provided 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>
- </dependencies>
-
- <!-- Build -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <!-- For some reason the distribution javadoc module needs this -->
- <file>target/${artifactId}-${version}-sources.jar</file>
- <classifier>sources</classifier>
- <type>jar</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <!-- Repositories -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <url>http://snapshots.jboss.org/maven2/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-</project>
Copied: projects/jboss-osgi/projects/parent/tags/jboss-osgi-spi-1.0.2/pom.xml (from rev 94734, projects/jboss-osgi/projects/spi/trunk/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/parent/tags/jboss-osgi-spi-1.0.2/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/parent/tags/jboss-osgi-spi-1.0.2/pom.xml 2009-10-13 06:29:23 UTC (rev 94735)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id$ -->
+
+<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 SPI</name>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <packaging>jar</packaging>
+
+ <version>1.0.2</version>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.3</version>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+ <version.args4j>2.0.12</version.args4j>
+ <version.jboss.logging>2.0.5.GA</version.jboss.logging>
+ <version.jboss.vfs>2.1.3.GA</version.jboss.vfs>
+ <version.osgi>r4v42</version.osgi>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+
+ <!-- Compile Dependencies -->
+ <dependency>
+ <groupId>args4j</groupId>
+ <artifactId>args4j</artifactId>
+ <version>${version.args4j}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${version.jboss.vfs}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.jboss.logging}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+
+ <!-- Provided 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>
+ </dependencies>
+
+ <!-- Build -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <!-- For some reason the distribution javadoc module needs this -->
+ <file>target/${artifactId}-${version}-sources.jar</file>
+ <classifier>sources</classifier>
+ <type>jar</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Repositories -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <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/tags/jboss-osgi-spi-1.0.2</url>
+ </scm>
+</project>
16 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r94734 - projects/jboss-osgi/projects/spi/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-13 02:28:59 -0400 (Tue, 13 Oct 2009)
New Revision: 94734
Modified:
projects/jboss-osgi/projects/spi/trunk/pom.xml
Log:
[maven-release-plugin] prepare release jboss-osgi-spi-1.0.2
Modified: projects/jboss-osgi/projects/spi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-10-13 06:27:15 UTC (rev 94733)
+++ projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-10-13 06:28:59 UTC (rev 94734)
@@ -20,13 +20,13 @@
<artifactId>jboss-osgi-spi</artifactId>
<packaging>jar</packaging>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.2</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
</parent>
<!-- Properties -->
@@ -128,4 +128,10 @@
</snapshots>
</repository>
</repositories>
+
+ <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/tags/jboss-osgi-spi-1.0.2</url>
+ </scm>
</project>
16 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r94732 - projects/jboss-osgi/projects/parent/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-13 02:21:40 -0400 (Tue, 13 Oct 2009)
New Revision: 94732
Modified:
projects/jboss-osgi/projects/parent/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-10-13 06:21:30 UTC (rev 94731)
+++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-10-13 06:21:40 UTC (rev 94732)
@@ -10,12 +10,12 @@
<url>http://www.jboss.org/community/wiki/JBossOSGi</url>
<description>JBossOSGi</description>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<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/tags/jboss-osgi-parent-1.0.3</url>
+ <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 -->
16 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r94731 - in projects/jboss-osgi/projects/parent/tags: jboss-osgi-parent-1.0.3 and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-13 02:21:30 -0400 (Tue, 13 Oct 2009)
New Revision: 94731
Added:
projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.3/
projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.3/pom.xml
Removed:
projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.3/pom.xml
Log:
[maven-release-plugin] copy for tag jboss-osgi-parent-1.0.3
Copied: projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.3 (from rev 93595, projects/jboss-osgi/projects/parent/trunk)
Deleted: projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.3/pom.xml
===================================================================
--- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-09-16 09:07:26 UTC (rev 93595)
+++ projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.3/pom.xml 2009-10-13 06:21:30 UTC (rev 94731)
@@ -1,250 +0,0 @@
-<?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</name>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-parent</artifactId>
- <packaging>pom</packaging>
-
- <url>http://www.jboss.org/community/wiki/JBossOSGi</url>
- <description>JBossOSGi</description>
-
- <version>1.0.2-SNAPSHOT</version>
-
- <!-- Properties -->
- <properties>
- <version.aqute.bnd>0.0.323</version.aqute.bnd>
- <version.jboss.logging>2.0.5.GA</version.jboss.logging>
- <version.junit>4.6</version.junit>
- </properties>
-
- <!-- DependencyManagement -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- <version>${version.aqute.bnd}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>${version.jboss.logging}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <!-- Build -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-URL>${url}</Implementation-URL>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>false</redirectTestOutputToFile>
- <failIfNoTests>false</failIfNoTests>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <quiet>true</quiet>
- <excludePackageNames>*.internal</excludePackageNames>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- <!-- PluginManagement -->
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- <version>${version.aqute.bnd}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <!-- Repositories -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <url>http://snapshots.jboss.org/maven2/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>aQute</id>
- <url>http://www.aQute.biz/repo</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <!-- PluginRepositories -->
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <url>http://repository.jboss.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
- </scm>
-
- <!-- Licenses -->
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt
- </url>
- </license>
- </licenses>
-
- <!-- DistributionManagement -->
- <distributionManagement>
- <!--
- Add this to your ~/.m2/settings.xml
- <servers>
- <server>
- <id>jbmuc.dyndns.org</id>
- <username>yourname</username>
- <privateKey>/home/yourname/.ssh/id_rsa</privateKey>
- <passphrase>yourpass</passphrase>
- </server>
- </servers>
- -->
- <repository>
- <id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
- </repository>
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- </snapshotRepository>
- <!--
- To do a site deploy run:
- mvn -Dversion.jboss.osgi=1.0.x site-deploy
- -->
- <site>
- <id>jbmuc.dyndns.org</id>
- <url>scp://jbmuc.dyndns.org/var/www/html/jboss-osgi-${version.jboss.osgi}</url>
- </site>
- <!--
- To copy the userguide run:
- scp -r docbook/target/docbook/publish/en-US/* jbmuc.dyndns.org:/var/www/html/jboss-osgi-${version.jboss.osgi}/userguide/
- -->
- </distributionManagement>
-
- <!-- Reporting -->
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <show>protected</show>
- <excludePackageNames>*.internal:*.incubator</excludePackageNames>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <!-- Profiles -->
- <profiles>
-
- <!--
- Name: no-jboss-bind-address
- Desc: Set the default jboss.bind.address
- -->
- <profile>
- <id>no-jboss-bind-address</id>
- <activation>
- <property>
- <name>!jboss.bind.address</name>
- </property>
- </activation>
- <properties>
- <jboss.bind.address>localhost</jboss.bind.address>
- </properties>
- </profile>
-
- </profiles>
-
-</project>
Copied: projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.3/pom.xml (from rev 94730, projects/jboss-osgi/projects/parent/trunk/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.3/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.3/pom.xml 2009-10-13 06:21:30 UTC (rev 94731)
@@ -0,0 +1,243 @@
+<?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</name>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <url>http://www.jboss.org/community/wiki/JBossOSGi</url>
+ <description>JBossOSGi</description>
+
+ <version>1.0.3</version>
+
+ <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/tags/jboss-osgi-parent-1.0.3</url>
+ </scm>
+
+ <!-- Properties -->
+ <properties>
+ <version.jboss.logging>2.0.5.GA</version.jboss.logging>
+ <version.junit>4.6</version.junit>
+ </properties>
+
+ <!-- DependencyManagement -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.logging}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Build -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-URL>${url}</Implementation-URL>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <goals>deploy</goals>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
+ <failIfNoTests>false</failIfNoTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ <excludePackageNames>*.internal</excludePackageNames>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ <!-- PluginManagement -->
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <!-- Repositories -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>aQute</id>
+ <url>http://www.aQute.biz/repo</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <!-- PluginRepositories -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <!-- Licenses -->
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt
+ </url>
+ </license>
+ </licenses>
+
+ <!-- DistributionManagement -->
+ <distributionManagement>
+ <!--
+ Add this to your ~/.m2/settings.xml
+ <servers>
+ <server>
+ <id>jbmuc.dyndns.org</id>
+ <username>yourname</username>
+ <privateKey>/home/yourname/.ssh/id_rsa</privateKey>
+ <passphrase>yourpass</passphrase>
+ </server>
+ </servers>
+ -->
+ <repository>
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ <!--
+ To do a site deploy run:
+ mvn -Dversion.jboss.osgi=1.0.x site-deploy
+ -->
+ <site>
+ <id>jbmuc.dyndns.org</id>
+ <url>scp://jbmuc.dyndns.org/var/www/html/jboss-osgi-${version.jboss.osgi}</url>
+ </site>
+ <!--
+ To copy the userguide run:
+ scp -r docbook/target/docbook/publish/en-US/* jbmuc.dyndns.org:/var/www/html/jboss-osgi-${version.jboss.osgi}/userguide/
+ -->
+ </distributionManagement>
+
+ <!-- Reporting -->
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <show>protected</show>
+ <excludePackageNames>*.internal:*.incubator</excludePackageNames>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <!-- Profiles -->
+ <profiles>
+
+ <!--
+ Name: no-jboss-bind-address
+ Desc: Set the default jboss.bind.address
+ -->
+ <profile>
+ <id>no-jboss-bind-address</id>
+ <activation>
+ <property>
+ <name>!jboss.bind.address</name>
+ </property>
+ </activation>
+ <properties>
+ <jboss.bind.address>localhost</jboss.bind.address>
+ </properties>
+ </profile>
+
+ </profiles>
+
+</project>
16 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r94730 - projects/jboss-osgi/projects/parent/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-13 02:21:07 -0400 (Tue, 13 Oct 2009)
New Revision: 94730
Modified:
projects/jboss-osgi/projects/parent/trunk/pom.xml
Log:
[maven-release-plugin] prepare release jboss-osgi-parent-1.0.3
Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-10-13 05:39:41 UTC (rev 94729)
+++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-10-13 06:21:07 UTC (rev 94730)
@@ -10,8 +10,14 @@
<url>http://www.jboss.org/community/wiki/JBossOSGi</url>
<description>JBossOSGi</description>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.3</version>
+ <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/tags/jboss-osgi-parent-1.0.3</url>
+ </scm>
+
<!-- Properties -->
<properties>
<version.jboss.logging>2.0.5.GA</version.jboss.logging>
@@ -155,12 +161,6 @@
</pluginRepository>
</pluginRepositories>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
- </scm>
-
<!-- Licenses -->
<licenses>
<license>
16 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r94668 - in projects/jboss-osgi/trunk/distribution: docbook/en/modules and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-12 09:49:36 -0400 (Mon, 12 Oct 2009)
New Revision: 94668
Added:
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack01-welcome.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack05-installpath.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack10-packs.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack15-target-framework.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack20-target-container.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack25-jboss-home.jpg
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack30-verify.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack35-done.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/runtime-structure.png
Removed:
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-done.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-installpath.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-jboss-home.jpg
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-packs.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-structure.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-target-container.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-target-framework.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-verify.png
projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-welcome.png
Modified:
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch020-getting-started.xml
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
Log:
Start work on userguide - WIP
Deleted: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-done.png
===================================================================
(Binary files differ)
Deleted: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-installpath.png
===================================================================
(Binary files differ)
Deleted: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-jboss-home.jpg
===================================================================
(Binary files differ)
Deleted: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-packs.png
===================================================================
(Binary files differ)
Deleted: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-structure.png
===================================================================
(Binary files differ)
Deleted: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-target-container.png
===================================================================
(Binary files differ)
Deleted: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-target-framework.png
===================================================================
(Binary files differ)
Deleted: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-verify.png
===================================================================
(Binary files differ)
Deleted: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-welcome.png
===================================================================
(Binary files differ)
Copied: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack01-welcome.png (from rev 94664, projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-welcome.png)
===================================================================
(Binary files differ)
Copied: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack05-installpath.png (from rev 94664, projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-installpath.png)
===================================================================
(Binary files differ)
Copied: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack10-packs.png (from rev 94664, projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-packs.png)
===================================================================
(Binary files differ)
Copied: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack15-target-framework.png (from rev 94664, projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-target-framework.png)
===================================================================
(Binary files differ)
Copied: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack20-target-container.png (from rev 94664, projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-target-container.png)
===================================================================
(Binary files differ)
Copied: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack25-jboss-home.jpg (from rev 94664, projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-jboss-home.jpg)
===================================================================
(Binary files differ)
Copied: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack30-verify.png (from rev 94664, projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-verify.png)
===================================================================
(Binary files differ)
Copied: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack35-done.png (from rev 94664, projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-done.png)
===================================================================
(Binary files differ)
Copied: projects/jboss-osgi/trunk/distribution/docbook/en/images/runtime-structure.png (from rev 94664, projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack-structure.png)
===================================================================
(Binary files differ)
Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch020-getting-started.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch020-getting-started.xml 2009-10-12 13:44:35 UTC (rev 94667)
+++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch020-getting-started.xml 2009-10-12 13:49:36 UTC (rev 94668)
@@ -21,14 +21,14 @@
<para>To run the installer execute the following command:</para>
<programlisting>
- java -jar jboss-osgi-installer-1.0.0.Beta3.jar
+ java -jar jboss-osgi-installer-1.0.0.Beta4.jar
</programlisting>
<para>The installer first shows a welcome screen</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/izpack-welcome.png"/>
+ <imagedata fileref="images/izpack01-welcome.png"/>
</imageobject>
</mediaobject>
@@ -37,7 +37,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/izpack-installpath.png"/>
+ <imagedata fileref="images/izpack05-installpath.png"/>
</imageobject>
</mediaobject>
@@ -45,7 +45,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/izpack-packs.png"/>
+ <imagedata fileref="images/izpack10-packs.png"/>
</imageobject>
</mediaobject>
@@ -59,7 +59,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/izpack-target-framework.png"/>
+ <imagedata fileref="images/izpack15-target-framework.png"/>
</imageobject>
</mediaobject>
@@ -67,15 +67,20 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/izpack-target-container.png"/>
+ <imagedata fileref="images/izpack20-target-container.png"/>
</imageobject>
</mediaobject>
<para>You will then have to point the installer to your existing <ulink url="http://http://jboss.org/jbossas">JBossAS</ulink> installation.</para>
+ <tip>
+ <title>Supported JBossAS versions</title>
+ <para>The Microcontainer based OSGi Framework is supported on JBoss-5.2.0 and above.</para>
+ </tip>
+
<mediaobject>
<imageobject>
- <imagedata fileref="images/izpack-jboss-home.jpg"/>
+ <imagedata fileref="images/izpack25-jboss-home.jpg"/>
</imageobject>
</mediaobject>
@@ -83,7 +88,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/izpack-verify.png"/>
+ <imagedata fileref="images/izpack30-verify.png"/>
</imageobject>
</mediaobject>
@@ -92,7 +97,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/izpack-done.png"/>
+ <imagedata fileref="images/izpack35-done.png"/>
</imageobject>
</mediaobject>
</sect1>
@@ -107,7 +112,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/izpack-structure.png"/>
+ <imagedata fileref="images/runtime-structure.png"/>
</imageobject>
</mediaobject>
@@ -127,7 +132,7 @@
JBoss OSGi Bootstrap Environment
- OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta3/runtime
+ OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta4/runtime
JAVA: /usr/java/jdk1.6/bin/java
@@ -135,22 +140,23 @@
=========================================================================
- 16:18:32,974 INFO [FelixIntegration] OSGi Integration Felix - 1.0.0.Beta3
- 16:18:33,403 INFO [FelixIntegration] Installed bundle [1]: org.osgi.compendium
- 16:18:33,412 INFO [FelixIntegration] Installed bundle [2]: org.apache.felix.log
- 16:18:33,425 INFO [FelixIntegration] Installed bundle [3]: jboss-osgi-common
- 16:18:33,435 INFO [FelixIntegration] Installed bundle [4]: jboss-osgi-hotdeploy
- 16:18:33,550 INFO [jboss-osgi-hotdeploy] Start DeploymentScanner: [scandir=server/default/bundles,interval=2000ms]
- 16:18:33,555 INFO [OSGiBootstrap] JBoss OSGi Runtime booted in 0.581sec
+ 15:36:52,683 INFO [OSGiBundleManager] JBossOSGi Framework
+ 15:36:52,685 INFO [OSGiBundleManager] 1.0.0.Alpha1
+ 15:36:53,161 INFO [FrameworkEventsPluginImpl] Bundle INSTALLED: Bundle{osgi.cmpn:4.2.0.200908310645}
+ 15:36:53,280 INFO [FrameworkEventsPluginImpl] Bundle INSTALLED: Bundle{org.apache.felix.log:1.0.0}
+ 15:36:53,403 INFO [FrameworkEventsPluginImpl] Bundle INSTALLED: Bundle{jboss-osgi-common:1.0.2.SNAPSHOT}
+ 15:36:53,442 INFO [FrameworkEventsPluginImpl] Bundle INSTALLED: Bundle{jboss-osgi-hotdeploy:1.0.2.SNAPSHOT}
+ 15:36:54,431 INFO [jboss-osgi-hotdeploy] Start DeploymentScanner: [scandir=.../server/default/deploy,interval=2000ms]
+ 15:36:54,462 INFO [OSGiBootstrap] JBossOSGi Runtime booted in 1.773sec
...
- 16:18:33,617 INFO [jboss-osgi-common] Installed: jboss-osgi-jndi [5]
- 16:18:33,627 INFO [jboss-osgi-common] Installed: jboss-osgi-jmx [6]
- 16:18:33,659 INFO [jboss-osgi-common] Installed: jboss-osgi-common-core [7]
+ 15:36:54,515 INFO [FrameworkEventsPluginImpl] Bundle INSTALLED: Bundle{jboss-osgi-jndi:1.0.1}
+ 15:36:54,551 INFO [FrameworkEventsPluginImpl] Bundle INSTALLED: Bundle{jboss-osgi-jmx:1.0.1}
+ 15:36:54,783 INFO [FrameworkEventsPluginImpl] Bundle INSTALLED: Bundle{jboss-osgi-common-core:2.2.13.GA}
...
- 16:18:34,170 INFO [jboss-osgi-jndi] JNDI started: JNP=localhost:1099, RMI=localhost:1098
- 16:18:34,543 INFO [jboss-osgi-jmx] MBeanServerConnection bound to: jmx/invoker/RMIAdaptor
+ 15:36:55,353 INFO [jboss-osgi-jndi] JNDI started: JNP=localhost:1099, RMI=localhost:1098
+ 15:36:55,687 INFO [jboss-osgi-jmx] MBeanServerConnection bound to: jmx/invoker/RMIAdaptor
...
- <emphasis role="bold">16:18:34,544 INFO [OSGiBootstrap] JBoss OSGi Runtime started in 1.57sec</emphasis>
+ <emphasis role="bold">15:36:57,705 INFO [OSGiBootstrap] JBossOSGi Runtime started in 3.021sec</emphasis>
</programlisting>
</sect1>
@@ -290,7 +296,7 @@
Buildfile: build.xml
init:
- [echo] V1.0.0.Beta3
+ [echo] V1.0.0.Beta4
init-hudson:
[echo]
@@ -318,7 +324,7 @@
Buildfile: build.xml
init:
- [echo] V1.0.0.Beta3
+ [echo] V1.0.0.Beta4
init-hudson:
[echo]
@@ -344,7 +350,7 @@
Buildfile: build.xml
init:
- [echo] V1.0.0.Beta3
+ [echo] V1.0.0.Beta4
init-hudson:
[echo]
Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml 2009-10-12 13:44:35 UTC (rev 94667)
+++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml 2009-10-12 13:49:36 UTC (rev 94668)
@@ -136,7 +136,7 @@
JBossOSGi Bootstrap Environment
- OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta3/runtime
+ OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta4/runtime
JAVA: /usr/java/jdk1.6/bin/java
@@ -144,7 +144,7 @@
=========================================================================
- 10:33:13,758 INFO [FelixIntegration] OSGi Integration Felix - 1.0.0.Beta3
+ 10:33:13,758 INFO [FelixIntegration] OSGi Integration Felix - 1.0.0.Beta4
10:33:14,185 INFO [FelixIntegration] Installed bundle [1]: org.osgi.compendium
10:33:14,194 INFO [FelixIntegration] Installed bundle [2]: org.apache.felix.log
10:33:14,203 INFO [FelixIntegration] Installed bundle [3]: jboss-osgi-common
Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml 2009-10-12 13:44:35 UTC (rev 94667)
+++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml 2009-10-12 13:49:36 UTC (rev 94668)
@@ -24,17 +24,17 @@
</imageobject>
</mediaobject>
- <para>The latest version of the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs">JBoss OSGi SPI</ulink>.</para>
+ <para>The latest version of the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs">JBoss OSGi SPI</ulink>.</para>
<itemizedlist>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi</ulink> - Common classes and interfaces.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.capability</ulink> - Capabilities that can be installed in the OSGi framework.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.framework</ulink> - Framework integration and bootstrap.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.logging</ulink> - Support for Bundle logging.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.management</ulink> - Management view on deployed bundles.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.service</ulink> - A collection of SPI provided services.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.testing</ulink> - OSGi test support classes and interfaces.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.util</ulink> - A collection of SPI provided utilities.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi</ulink> - Common classes and interfaces.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.capability</ulink> - Capabilities that can be installed in the OSGi framework.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.framework</ulink> - Framework integration and bootstrap.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.logging</ulink> - Support for Bundle logging.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.management</ulink> - Management view on deployed bundles.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.service</ulink> - A collection of SPI provided services.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.testing</ulink> - OSGi test support classes and interfaces.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.util</ulink> - A collection of SPI provided utilities.</listitem>
</itemizedlist>
<emphasis role="bold">Bootstrapping JBoss OSGi</emphasis>
@@ -72,8 +72,8 @@
<para>The JBoss OSGi SPI comes with two bootstrap providers:</para>
<itemizedlist>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">PropertiesBootstrapProvider</ulink></listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">MicrocontainerBootstrapProvider</ulink></listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">PropertiesBootstrapProvider</ulink></listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">MicrocontainerBootstrapProvider</ulink></listitem>
</itemizedlist>
<para>OSGiBootstrapProvider implementations that read their configurtation from some other source are possible, but currently not
@@ -181,7 +181,7 @@
<emphasis role="bold">The ManagedFramework</emphasis>
- <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">
+ <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">
ManagedFramework</ulink> gives you access to the MBean views of the deployed Bundles. It is registerd under the name:</para>
<itemizedlist>
@@ -190,7 +190,7 @@
<emphasis role="bold">The ManagedBundle</emphasis>
- <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">
+ <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">
ManagedBundle</ulink> gives you access to the MBean views of a deployed Bundle. It is registerd under the name:</para>
<itemizedlist>
@@ -200,7 +200,7 @@
<emphasis role="bold">Accessing the Management Objects</emphasis>
<para>If you work with the JBoss OSGi Testsuite you get access to the Managed Objects through the JBoss OSGi SPI provided
- <ulink url="http://junit.sourceforge.net/">JUnit</ulink> support package <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.testing</ulink>.
+ <ulink url="http://junit.sourceforge.net/">JUnit</ulink> support package <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.testing</ulink>.
</para>
<para>If you install JBoss OSGi in an already existing JBossAS instance you also get access to the Managed Objects through the JBoss provided
@@ -221,7 +221,7 @@
<title>Writing Test Cases</title>
<para>JBoss OSGi comes with <ulink url="http://www.junit.org">JUnit</ulink> test support as part of the SPI provided
- <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.testing</ulink>
+ <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.testing</ulink>
package. There are two distinct test scenarios that we support:</para>
<itemizedlist>
Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml 2009-10-12 13:44:35 UTC (rev 94667)
+++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml 2009-10-12 13:49:36 UTC (rev 94668)
@@ -64,39 +64,39 @@
<para>Here is how it works </para>
<orderedlist>
- <listitem>A <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">Bridge</ulink>
+ <listitem>A <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/hus...">Bridge</ulink>
intercepts a test and determines the FQN of the test case and the test method from the call stack. It then delegates the execution to the same
(or another) test in and isolated test environment. An isolated test environment is one that does not have the same class loading space as
the test itself.</listitem>
- <listitem>A Bridge is associated with an <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
+ <listitem>A Bridge is associated with an <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/hus...">
Invoker</ulink>. Invokers may be arbitarily complex. Local 'in proccess' invokers are possible just as well as remote invokers. </listitem>
- <listitem>The Invoker sends the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
- Request</ulink> to a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
+ <listitem>The Invoker sends the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/hus...">
+ Request</ulink> to a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/hus...">
Connector</ulink> in the isolated test environment.</listitem>
- <listitem>A Connector has associated <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
+ <listitem>A Connector has associated <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/hus...">
PackageListeners</ulink> that are responsible for processing test cases for their respective test packages.</listitem>
- <listitem>A PackageListeners delegates the Request to a test <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
- Runner</ulink>, typicaly this would be a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
+ <listitem>A PackageListeners delegates the Request to a test <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/hus...">
+ Runner</ulink>, typicaly this would be a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/hus...">
JUnitRunner</ulink>.</listitem>
- <listitem>The Runner injects the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
- Context</ulink> into the test case and returns a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
+ <listitem>The Runner injects the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/hus...">
+ Context</ulink> into the test case and returns a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/hus...">
Response</ulink>, which the Connector returns to the Invoker.</listitem>
- <listitem>The Bridge finally translates potential <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
+ <listitem>The Bridge finally translates potential <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/hus...">
Failures</ulink> that may be contained in the Result, to test failures on the client side.</listitem>
</orderedlist>
<para>The JBoss OSGi <emphasis role="bold">jboss-osgi-husky.jar</emphasis> bundle registers the Connectors.
- The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
+ The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/hus...">
JMXConnector</ulink> is always registered.
- The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
+ The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/hus...">
SocketConnector</ulink> is registered when the appropriate configuration options are set. It then registers the
- <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">HuskyExtender</ulink>,
+ <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/hus...">HuskyExtender</ulink>,
which is a <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/framework/BundleListener.html">BundleListener</ulink> that inspects every
incomming bundle for the <emphasis role="bold">Test-Package</emphasis> manifest header. The Extender creates a PackageListener
for every package in the 'Test-Package' manifest header and registers them with the available Connectors.</para>
Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml 2009-10-12 13:44:35 UTC (rev 94667)
+++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml 2009-10-12 13:49:36 UTC (rev 94668)
@@ -33,7 +33,7 @@
<para>The service is registered with the Framework under the name</para>
<itemizedlist>
- <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/jax...">org.jboss.osgi.jaxb.JAXBService</ulink></emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/jax...">org.jboss.osgi.jaxb.JAXBService</ulink></emphasis></listitem>
</itemizedlist>
</sect1>
@@ -70,7 +70,7 @@
<itemizedlist>
<listitem><emphasis role="bold"><ulink url="http://java.sun.com/javase/6/docs/api/javax/management/MBeanServer.html">javax.management.MBeanServer</ulink></emphasis></listitem>
- <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.management.ManagedBundleService</ulink></emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.management.ManagedBundleService</ulink></emphasis></listitem>
<!-- https://jira.jboss.org/jira/browse/JBOSGI-125 -->
</itemizedlist>
@@ -168,7 +168,7 @@
<para>On the client side you can install an arbitrary <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogListener.html">LogListener</ulink>
with the <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogReaderService.html">RemoteLogReaderService</ulink>. The testsuite typically
- installs an <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">LogEntryCache</ulink>
+ installs an <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">LogEntryCache</ulink>
that filters the received log messages.</para>
<programlisting role="JAVA">
@@ -197,7 +197,7 @@
The service is registered with the Framework under the name</para>
<itemizedlist>
- <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/mic...">org.jboss.osgi.microcontainer.MicrocontainerService</ulink></emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/mic...">org.jboss.osgi.microcontainer.MicrocontainerService</ulink></emphasis></listitem>
</itemizedlist>
<para>Here is an example of how an OSGi component can access an arbitrary MC bean.</para>
@@ -231,8 +231,8 @@
<emphasis role="bold">Blueprint Reflection</emphasis> packages.</para>
<itemizedlist>
- <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/osgi/service/b...">org.osgi.service.blueprint.container</ulink></emphasis></listitem>
- <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/osgi/service/b...">org.osgi.service.blueprint.reflect</ulink></emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/osgi/service/b...">org.osgi.service.blueprint.container</ulink></emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/osgi/service/b...">org.osgi.service.blueprint.reflect</ulink></emphasis></listitem>
</itemizedlist>
</sect1>
Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml 2009-10-12 13:44:35 UTC (rev 94667)
+++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml 2009-10-12 13:49:36 UTC (rev 94668)
@@ -206,7 +206,7 @@
<note>
<para>Please note that access to the MBeanServer from the test case is part of the
- <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">
+ <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">
OSGiRuntime</ulink> abstraction.</para>
</note>
@@ -252,7 +252,7 @@
<note>
<para>Please note that access to the InitialContext from the test case is part of the
- <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">
+ <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta4/apidocs/org/jboss/osgi/spi...">
OSGiRuntime</ulink> abstraction.</para>
</note>
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-12 13:44:35 UTC (rev 94667)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-12 13:49:36 UTC (rev 94668)
@@ -5,7 +5,7 @@
otherwise use variables below in installer files with ${}
-->
<info>
- <appname>@{product.name}</appname>
+ <appname>JBoss OSGi</appname>
<appversion>@{product.version}</appversion>
<uninstaller name="remove.task" write="yes" />
</info>
16 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r94666 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/installer and 5 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-12 08:36:23 -0400 (Mon, 12 Oct 2009)
New Revision: 94666
Added:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/metadata-deployer-jboss-beans.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/war-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss510/
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss510/war-deployers-jboss-beans.xml
Removed:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/metadata-deployer-jboss-beans.xml
Modified:
projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
Log:
Patch jboss501/jboss510 to support OSGi *.war deployments
Modified: projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml 2009-10-12 08:30:32 UTC (rev 94665)
+++ projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml 2009-10-12 12:36:23 UTC (rev 94666)
@@ -81,7 +81,7 @@
<!-- jbossas -->
<fileSet>
<directory>src/main/resources/jbossas</directory>
- <outputDirectory>resources/jbossas-config</outputDirectory>
+ <outputDirectory>resources/jbossas</outputDirectory>
</fileSet>
</fileSets>
</assembly>
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-12 08:30:32 UTC (rev 94665)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-12 12:36:23 UTC (rev 94666)
@@ -346,10 +346,20 @@
<description>Integration with an existing JBossAS instance</description>
<!-- https://jira.jboss.org/jira/browse/JBOSGI-94 -->
- <fileset condition="isJBoss501" dir="@{deploy.artifacts.dir}/resources/jbossas-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers"
- override="true">
+ <fileset condition="isJBoss501" dir="@{deploy.artifacts.dir}/resources/jbossas/jboss501"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" override="true">
<include name="metadata-deployer-jboss-beans.xml" />
</fileset>
+ <!-- https://jira.jboss.org/jira/browse/JBAS-7322 -->
+ <fileset condition="isJBoss501" dir="@{deploy.artifacts.dir}/resources/jbossas/jboss501"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/jbossweb.deployer/META-INF" override="true">
+ <include name="war-deployers-jboss-beans.xml" />
+ </fileset>
+ <!-- https://jira.jboss.org/jira/browse/JBAS-7322 -->
+ <fileset condition="isJBoss510" dir="@{deploy.artifacts.dir}/resources/jbossas/jboss510"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/jbossweb.deployer/META-INF" override="true">
+ <include name="war-deployers-jboss-beans.xml" />
+ </fileset>
<!-- deployers/osgi.deployer -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
@@ -381,7 +391,7 @@
<include name="jboss-osgi-runtime-jbossas.jar" />
<include name="org.apache.felix.framework.jar" />
</fileset>
- <singlefile condition="isFelix" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
+ <singlefile condition="isFelix" src="@{deploy.artifacts.dir}/resources/jbossas/jboss-beans-felix.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
override="true" />
<fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
@@ -405,7 +415,7 @@
<include name="org.apache.equinox.framework.jar" />
<include name="org.eclipse.osgi.jar" />
</fileset>
- <singlefile condition="isEquinox" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-equinox.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
+ <singlefile condition="isEquinox" src="@{deploy.artifacts.dir}/resources/jbossas/jboss-beans-equinox.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
override="true" />
<fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
@@ -423,7 +433,7 @@
override="true">
<include name="jboss-osgi-framework.jar" />
</fileset>
- <singlefile condition="isJBossMC" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-jbossmc.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
+ <singlefile condition="isJBossMC" src="@{deploy.artifacts.dir}/resources/jbossas/jboss-beans-jbossmc.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
override="true" />
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
Copied: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/metadata-deployer-jboss-beans.xml (from rev 94664, projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/metadata-deployer-jboss-beans.xml)
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/metadata-deployer-jboss-beans.xml (rev 0)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/metadata-deployer-jboss-beans.xml 2009-10-12 12:36:23 UTC (rev 94666)
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ MetaData configuration
+
+ This add the DeploymentProvidedDUFilter which does not exist in jboss501
+
+ $Id$
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- A reference metadata resolving deployer that creates and endpoint map
+ for the deployments
+ -->
+ <bean name="ReferenceMetaDataResolverDeployer" class="org.jboss.deployment.MappedReferenceMetaDataResolverDeployer" />
+
+ <!-- Generic scanning deployer - using javassist to do lookup -->
+
+ <bean name="EarLibExcludeDeployer" class="org.jboss.deployment.EarLibExcludeDeployer" />
+
+ <bean name="JBossMetaDataDUFilter" class="org.jboss.deployment.JBossMetaDataDeploymentUnitFilter" />
+
+ <bean name="ScanningMetaDataDeployer" class="org.jboss.deployers.vfs.plugins.annotations.ScanningMetaDataDeployer" />
+ <bean name="ScanningMetaDataDUFilter" class="org.jboss.deployers.vfs.plugins.annotations.ScanningDeploymentUnitFilter" />
+
+ <bean name="JBossCustomDeployDUFilter" class="org.jboss.deployers.vfs.spi.structure.helpers.VirtualFileDeploymentUnitFilter">
+ <constructor>
+ <parameter>
+ <bean class="org.jboss.deployment.FileNameVirtualFileFilter">
+ <constructor>
+ <parameter>
+ <map keyClass="java.lang.String" valueClass="java.util.Set">
+ <entry>
+ <key>jbossweb.sar</key>
+ <value>
+ <null />
+ </value>
+ </entry>
+ <entry>
+ <key>console-mgr.sar</key>
+ <value>
+ <null />
+ </value>
+ </entry>
+ <entry>
+ <key>jbossws.sar</key>
+ <value>
+ <null />
+ </value>
+ </entry>
+ <entry>
+ <key>jmx-remoting.sar</key>
+ <value>
+ <null />
+ </value>
+ </entry>
+ <entry>
+ <key>jboss-local-jdbc.rar</key>
+ <value>
+ <null />
+ </value>
+ </entry>
+ <entry>
+ <key>jboss-xa-jdbc.rar</key>
+ <value>
+ <null />
+ </value>
+ </entry>
+ <entry>
+ <key>jms-ra.rar</key>
+ <value>
+ <null />
+ </value>
+ </entry>
+ <entry>
+ <key>mail-ra.rar</key>
+ <value>
+ <null />
+ </value>
+ </entry>
+ <entry>
+ <key>quartz-ra.rar</key>
+ <value>
+ <null />
+ </value>
+ </entry>
+ <entry>
+ <key>jmx-console.war</key>
+ <value>
+ <null />
+ </value>
+ </entry>
+ </map>
+ </parameter>
+ </constructor>
+ </bean>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="DeploymentProvidedDUFilter" class="org.jboss.osgi.deployer.helpers.DeploymentProvidedDeploymentUnitFilter" />
+
+ <bean name="GenScanDeployer" class="org.jboss.deployers.vfs.plugins.annotations.FilteredAnnotationEnvironmentDeployer">
+ <property name="filter">
+ <bean class="org.jboss.deployment.ListDeploymentUnitFilter">
+ <property name="filters">
+ <list>
+ <inject bean="DeploymentProvidedDUFilter" />
+ <inject bean="JBossMetaDataDUFilter" />
+ <inject bean="ScanningMetaDataDUFilter" />
+ <inject bean="JBossCustomDeployDUFilter" />
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
+ <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.OptAnnotationMetaDataDeployer">
+ <property name="metaDataCompleteIsDefault">false</property>
+ </bean>
+
+ <!--
+ Extract annotations into a standard metadata view <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.AnnotationMetaDataDeployer"> <property
+ name="metaDataCompleteIsDefault">false</property> </bean>
+ -->
+
+ <!--
+ The schema location to JBossXB binding class mappings. We specify the dtd/xsd name of the schema as the location to work with legacy dtd as well as namespace based
+ documents.
+ -->
+ <bean name="SchemaResolverConfig" class="org.jboss.xb.binding.sunday.unmarshalling.SchemaResolverConfig">
+
+ <!-- schemaLocation to JBossXBuilder binding classes -->
+ <property name="bindingClassesByLocations">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <!-- EarMetaData -->
+ <entry>
+ <key>application</key>
+ <value>org.jboss.metadata.ear.spec.Ear13DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>application_1_2.dtd</key>
+ <value>org.jboss.metadata.ear.spec.Ear13DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>application_1_3.dtd</key>
+ <value>org.jboss.metadata.ear.spec.Ear13DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>application_1_4.xsd</key>
+ <value>org.jboss.metadata.ear.spec.Ear14MetaData</value>
+ </entry>
+ <entry>
+ <key>application_5.xsd</key>
+ <value>org.jboss.metadata.ear.spec.Ear50MetaData</value>
+ </entry>
+ <!-- JBossAppMetaData -->
+ <entry>
+ <key>jboss-app</key>
+ <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-app_3_0.dtd</key>
+ <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-app_3_2.dtd</key>
+ <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-app_4_0.dtd</key>
+ <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-app_4_2.dtd</key>
+ <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-app_5_0.dtd</key>
+ <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-app_5_0.xsd</key>
+ <value>org.jboss.metadata.ear.jboss.JBoss50AppMetaData</value>
+ </entry>
+
+ <!-- ApplicationClientMetaData -->
+ <entry>
+ <key>application-client</key>
+ <value>org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>application-client_1_2.dtd</key>
+ <value>org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>application-client_1_3.dtd</key>
+ <value>org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>application-client_1_4.xsd</key>
+ <value>org.jboss.metadata.client.spec.ApplicationClient14MetaData</value>
+ </entry>
+ <entry>
+ <key>application-client_5.xsd</key>
+ <value>org.jboss.metadata.client.spec.ApplicationClient5MetaData</value>
+ </entry>
+ <!-- ApplicationClientMetaData -->
+ <entry>
+ <key>jboss-client</key>
+ <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-client_3_0.dtd</key>
+ <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-client_3_2.dtd</key>
+ <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-client_4_0.dtd</key>
+ <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-client_4_2.dtd</key>
+ <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-client_5_0.dtd</key>
+ <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-client_5_0.xsd</key>
+ <value>org.jboss.metadata.client.jboss.JBossClient5MetaData</value>
+ </entry>
+
+ <!-- EjbJarMetaData -->
+ <entry>
+ <key>ejb-jar</key>
+ <value>org.jboss.metadata.ejb.spec.EjbJar20MetaData</value>
+ </entry>
+ <entry>
+ <key>ejb-jar_1_1.dtd</key>
+ <value>org.jboss.metadata.ejb.spec.EjbJar1xMetaData</value>
+ </entry>
+ <entry>
+ <key>ejb-jar_2_0.dtd</key>
+ <value>org.jboss.metadata.ejb.spec.EjbJar20MetaData</value>
+ </entry>
+ <entry>
+ <key>ejb-jar_2_1.xsd</key>
+ <value>org.jboss.metadata.ejb.spec.EjbJar21MetaData</value>
+ </entry>
+ <entry>
+ <key>ejb-jar_3_0.xsd</key>
+ <value>org.jboss.metadata.ejb.spec.EjbJar30MetaData</value>
+ </entry>
+
+ <!-- JBossMetaData -->
+ <entry>
+ <key>jboss</key>
+ <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss_3_0.dtd</key>
+ <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss_3_2.dtd</key>
+ <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss_4_0.dtd</key>
+ <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss_4_2.dtd</key>
+ <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss_5_0.dtd</key>
+ <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss_5_0.xsd</key>
+ <value>org.jboss.metadata.ejb.jboss.JBoss50MetaData</value>
+ </entry>
+
+ <!-- WebMetaData -->
+ <entry>
+ <key>web-app</key>
+ <value>org.jboss.metadata.web.spec.Web23MetaData</value>
+ </entry>
+ <entry>
+ <key>web-app_2_2.dtd</key>
+ <value>org.jboss.metadata.web.spec.Web23MetaData</value>
+ </entry>
+ <entry>
+ <key>web-app_2_3.dtd</key>
+ <value>org.jboss.metadata.web.spec.Web23MetaData</value>
+ </entry>
+ <entry>
+ <key>web-app_2_4.xsd</key>
+ <value>org.jboss.metadata.web.spec.Web24MetaData</value>
+ </entry>
+ <entry>
+ <key>web-app_2_5.xsd</key>
+ <value>org.jboss.metadata.web.spec.Web25MetaData</value>
+ </entry>
+ <!-- JBossWebMetaData -->
+ <entry>
+ <key>jboss-web</key>
+ <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-web_3_0.dtd</key>
+ <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-web_3_2.dtd</key>
+ <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-web_4_0.dtd</key>
+ <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-web_4_2.dtd</key>
+ <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-web_5_0.dtd</key>
+ <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+ </entry>
+ <entry>
+ <key>jboss-web_5_0.xsd</key>
+ <value>org.jboss.metadata.web.jboss.JBoss50WebMetaData</value>
+ </entry>
+ <!-- PersistenceMetaData -->
+ <entry>
+ <key>persistence_1_0.xsd</key>
+ <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+</deployment>
Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/war-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/war-deployers-jboss-beans.xml (rev 0)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/war-deployers-jboss-beans.xml 2009-10-12 12:36:23 UTC (rev 94666)
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Web application deployers
+$Id$
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- WAR Structure -->
+ <bean name="WARStructure" class="org.jboss.web.deployers.WARStructure">
+ <property name="webInfLibFilter">
+ <!-- We accept all .jar files in WEB-INF/lib -->
+ <bean name="WebInfLibFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter">
+ <constructor><parameter class="java.lang.String">.jar</parameter></constructor>
+ </bean>
+ </property>
+ <property name="includeWebInfInClasspath">true</property>
+ <property name="contextInfoOrder">1000</property>
+ </bean>
+
+ <!-- web.xml parsing deployer -->
+ <bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer">
+ <property name="relativeOrder">2000</property>
+ </bean>
+ <bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
+ <property name="relativeOrder">2001</property>
+ </bean>
+
+ <!-- See JBAS-6062
+ <bean name="WebXmlLessDeployer" class="org.jboss.deployment.LegacyWebXmlLessDeployer"/>
+ -->
+
+ <!-- Allow for war local class loaders: in testing -->
+ <bean name="WarClassLoaderDeployer" class="org.jboss.web.tomcat.service.deployers.WarClassLoaderDeployer">
+ <property name="relativeOrder">-1</property>
+ <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property>
+ </bean>
+
+ <!--
+ Injects default clustering metadata.
+ TODO. A better approach is to use a jboss-web.xml equivalent to conf/web.xml
+ and conf/standardjboss.xml as the source for defaults.
+ -->
+ <bean name="WebAppClusteringDefaultsDeployer"
+ class="org.jboss.web.tomcat.service.deployers.ClusteringDefaultsDeployer">
+
+ <!-- Default session cache config used by distributable webapps -->
+ <property name="cacheName">standard-session-cache</property>
+ <!-- Default session cache config used by FIELD granularity distributable webapps -->
+ <property name="fieldGranularityCacheName">field-granularity-session-cache</property>
+
+ <!--
+ The following two properties define when sessions are replicated to
+ the other nodes.
+ The default value, "instant", uses the request thread to replicate changes
+ to the other nodes at the end of requests. In this case, the
+ "SnapshotInterval" property is not used.
+ The "interval" mode uses a background thread that periodically checks for
+ modified sessions and replicates them. The "SnapshotInterval"
+ property controls how often (in milliseconds) the background thread
+ should run.
+
+ Note that this property is not in effect if the replication-granularity
+ is set to FIELD. If it is FIELD, it will be per http request (that is,
+ "instant" mode.)
+ -->
+ <property name="snapshotMode">INSTANT</property>
+ <property name="snapshotInterval">1000</property>
+
+ <property name="replicationGranularity">SESSION</property>
+ <property name="replicationTrigger">SET_AND_NON_PRIMITIVE_GET</property>
+ <property name="replicationFieldBatchMode">true</property>
+
+ <!--
+ Whether by default to add special session handling to coordinate use
+ with mod_jk or other JK connector variants.
+ If a JK connector is used, you will need to set the JvmRoute inside
+ JBossWeb, e.g. configure,
+ Engine name="jboss.web" jvmRoute="Node1" defaultHost="localhost"
+ in server.xml.
+
+ This value can be configured per webapp in the webapp's jboss.xml.
+
+ If not set, the default will be to add the special session handling
+ if a jvmRoute is configured on the Engine. So, generally the only reason
+ to configure this overall default is to set it to 'false' and thus force
+ per webapp configuration.
+ -->
+ <!--
+ <property name="useJK">false</property>
+
+ <property name="useSessionPassivation">false</property>
+ <property name="passivationMaxIdleTime">-1</property>
+ <property name="passivationMinIdleTime">-1</property>
+ -->
+
+ <!--
+ Determines the maximum interval between requests, in seconds, after
+ which a request will trigger replication of the session's timestamp
+ regardless of whether the request has otherwise made the session dirty.
+ Such replication ensures that other nodes in the cluster are aware of
+ the most recent value for the session's timestamp and won't incorrectly
+ expire an unreplicated session upon failover. It also results in correct
+ values for HttpSession.getLastAccessedTime() calls following failover.
+
+ The cost of timestamp replication is considerably lower in JBoss AS 5
+ than it is in earlier versions since replicating a timestamp does not
+ necessitate replicating any other data.
+
+ A value of 0 means the metadata will be replicated whenever the session is
+ accessed. A value of -1 means the metadata will be replicated only if some
+ other activity during the request (e.g. modifying an attribute) has
+ resulted in other replication work involving the session. A positive value
+ greater than the HttpSession.getMaxInactiveInterval() value will be treated
+ as a likely misconfiguration and converted to 0; i.e. replicate the
+ metadata on every request.
+ -->
+ <property name="maxUnreplicatedInterval">60</property>
+
+ </bean>
+
+ <!-- The WebMetaData to service mbean deployer -->
+ <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
+ </parameter>
+ <parameter>
+ <value>war</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
+ </parameter>
+ </uninstall>
+
+ <!-- Inject the MainDeployer for resolving cross deployment refs -->
+ <property name="mainDeployer"><inject bean="MainDeployer" /></property>
+
+ <property name="relativeOrder">2003</property>
+
+ <!-- FIXME Get this moved to TomcatService in deploy -->
+ <property name="configFile">
+ <value-factory bean="ServiceBindingManager" method="getResourceBinding">
+ <parameter>jboss.web:service=WebServer</parameter>
+ <parameter>${jboss.server.home.url}${/}deploy${/}jbossweb.sar${/}server.xml</parameter>
+ </value-factory>
+ </property>
+
+ <!-- You can configure a set of authenticators keyed by http-auth method
+ used. This will apply the same set of authenticators across all web
+ applications. You can override the set of authenticators at the web
+ application level by adding <authenticators> element to the respective
+ jboss-web.xml
+ -->
+ <property name="authenticators">
+ <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>BASIC</key>
+ <value>org.apache.catalina.authenticator.BasicAuthenticator</value>
+ </entry>
+ <entry>
+ <key>CLIENT-CERT</key>
+ <value>org.apache.catalina.authenticator.SSLAuthenticator</value>
+ </entry>
+ <entry>
+ <key>DIGEST</key>
+ <value>org.apache.catalina.authenticator.DigestAuthenticator</value>
+ </entry>
+ <entry>
+ <key>FORM</key>
+ <value>org.apache.catalina.authenticator.FormAuthenticator</value>
+ </entry>
+ <entry>
+ <key>NONE</key>
+ <value>org.apache.catalina.authenticator.NonLoginAuthenticator</value>
+ </entry>
+ </map>
+ </property>
+
+ <!-- The JAAS security domain to use in the absense of an explicit
+ security-domain specification in the war WEB-INF/jboss-web.xml
+ -->
+ <property name="defaultSecurityDomain">java:/jaas/jboss-web-policy</property>
+
+ <!-- Get the flag indicating if the normal Java2 parent first class
+ loading model should be used over the servlet 2.3 web container first
+ model.
+ -->
+ <property name="java2ClassLoadingCompliance">false</property>
+ <!-- A flag indicating if the JBoss Loader should be used. This loader
+ uses a unified class loader as the class loader rather than the tomcat
+ specific class loader.
+ The default is false to ensure that wars have isolated class loading
+ for duplicate jars and jsp files.
+ -->
+ <property name="useJBossWebLoader">false</property>
+ <!-- The list of package prefixes that should not be loaded without
+ delegating to the parent class loader before trying the web app
+ class loader. The packages listed here are those tha are used by
+ the web container implementation and cannot be overriden. The format
+ is a comma separated list of the package names. There cannot be any
+ whitespace between the package prefixes.
+ This setting only applies when UseJBossWebLoader=false.
+ -->
+ <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property>
+
+ <property name="lenientEjbLink">true</property>
+
+ <!--Flag to delete the Work Dir on Context Destroy -->
+ <property name="deleteWorkDirOnContextDestroy">false</property>
+
+ <!--
+ Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
+ - org.jboss.web.tomcat.service.session.JBossCacheManager
+ -->
+ <property name="managerClass">org.jboss.web.tomcat.service.session.JBossCacheManager</property>
+
+ <!-- The name of the request property under with the authenticated JAAS
+ Subject is stored on successful authentication. If null or empty then
+ the Subject will not be stored.
+ -->
+ <!--
+ <property name="subjectAttributeName">j_subject</property>
+ -->
+
+ <!-- The SessionIdAlphabet is the set of characters used to create a session Id
+ It must be made up of exactly 65 unique characters
+ <property name="sessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-_</property>
+ -->
+
+ <property name="domain">jboss.web</property>
+ <!-- Specify a Bean for JBoss Security PolicyRegistration -->
+ <property name="policyRegistrationName">JBossSecurityPolicyRegistration</property>
+
+ <!-- Specify a SecurityManagement Wrapper -->
+ <property name="securityManagementName">JNDIBasedSecurityManagement</property>
+
+ <!-- Specify a SecurityContext FQN class name -->
+ <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property>
+ </bean>
+
+ <bean name="MergedJBossWebMetaDataDeployer"
+ class="org.jboss.web.deployers.MergedJBossWebMetaDataDeployer">
+ </bean>
+
+</deployment>
Property changes on: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/war-deployers-jboss-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss510/war-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss510/war-deployers-jboss-beans.xml (rev 0)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss510/war-deployers-jboss-beans.xml 2009-10-12 12:36:23 UTC (rev 94666)
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Web application deployers
+$Id$
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- WAR Structure -->
+ <bean name="WARStructure" class="org.jboss.web.deployers.WARStructure">
+ <property name="webInfLibFilter">
+ <!-- We accept all .jar files in WEB-INF/lib -->
+ <bean name="WebInfLibFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter">
+ <constructor><parameter class="java.lang.String">.jar</parameter></constructor>
+ </bean>
+ </property>
+ <property name="includeWebInfInClasspath">true</property>
+ <property name="contextInfoOrder">1000</property>
+ </bean>
+
+ <!-- web.xml parsing deployer -->
+ <bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer">
+ <property name="relativeOrder">2000</property>
+ </bean>
+ <bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
+ <property name="relativeOrder">2001</property>
+ </bean>
+
+ <!-- See JBAS-6062
+ <bean name="WebXmlLessDeployer" class="org.jboss.deployment.LegacyWebXmlLessDeployer"/>
+ -->
+
+ <!-- Allow for war local class loaders: in testing -->
+ <bean name="WarClassLoaderDeployer" class="org.jboss.web.tomcat.service.deployers.WarClassLoaderDeployer">
+ <property name="relativeOrder">-1</property>
+ <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property>
+ </bean>
+
+ <!--
+ Injects default clustering metadata.
+ TODO. A better approach is to use a jboss-web.xml equivalent to conf/web.xml
+ and conf/standardjboss.xml as the source for defaults.
+ -->
+ <bean name="WebAppClusteringDefaultsDeployer"
+ class="org.jboss.web.tomcat.service.deployers.ClusteringDefaultsDeployer">
+
+ <!-- Default session cache config used by distributable webapps -->
+ <property name="cacheName">standard-session-cache</property>
+ <!-- Default session cache config used by FIELD granularity distributable webapps -->
+ <property name="fieldGranularityCacheName">field-granularity-session-cache</property>
+
+ <!--
+ The following two properties define when sessions are replicated to
+ the other nodes.
+ The default value, "instant", uses the request thread to replicate changes
+ to the other nodes at the end of requests. In this case, the
+ "SnapshotInterval" property is not used.
+ The "interval" mode uses a background thread that periodically checks for
+ modified sessions and replicates them. The "SnapshotInterval"
+ property controls how often (in milliseconds) the background thread
+ should run.
+
+ Note that this property is not in effect if the replication-granularity
+ is set to FIELD. If it is FIELD, it will be per http request (that is,
+ "instant" mode.)
+ -->
+ <property name="snapshotMode">INSTANT</property>
+ <property name="snapshotInterval">1000</property>
+
+ <property name="replicationGranularity">SESSION</property>
+ <property name="replicationTrigger">SET_AND_NON_PRIMITIVE_GET</property>
+ <property name="replicationFieldBatchMode">true</property>
+
+ <!--
+ Whether by default to add special session handling to coordinate use
+ with mod_jk or other JK connector variants.
+ If a JK connector is used, you will need to set the JvmRoute inside
+ JBossWeb, e.g. configure,
+ Engine name="jboss.web" jvmRoute="Node1" defaultHost="localhost"
+ in server.xml.
+
+ This value can be configured per webapp in the webapp's jboss.xml.
+
+ If not set, the default will be to add the special session handling
+ if a jvmRoute is configured on the Engine. So, generally the only reason
+ to configure this overall default is to set it to 'false' and thus force
+ per webapp configuration.
+ -->
+ <!--
+ <property name="useJK">false</property>
+
+ <property name="useSessionPassivation">false</property>
+ <property name="passivationMaxIdleTime">-1</property>
+ <property name="passivationMinIdleTime">-1</property>
+ -->
+
+ <!--
+ Determines the maximum interval between requests, in seconds, after
+ which a request will trigger replication of the session's timestamp
+ regardless of whether the request has otherwise made the session dirty.
+ Such replication ensures that other nodes in the cluster are aware of
+ the most recent value for the session's timestamp and won't incorrectly
+ expire an unreplicated session upon failover. It also results in correct
+ values for HttpSession.getLastAccessedTime() calls following failover.
+
+ The cost of timestamp replication is considerably lower in JBoss AS 5
+ than it is in earlier versions since replicating a timestamp does not
+ necessitate replicating any other data.
+
+ A value of 0 means the metadata will be replicated whenever the session is
+ accessed. A value of -1 means the metadata will be replicated only if some
+ other activity during the request (e.g. modifying an attribute) has
+ resulted in other replication work involving the session. A positive value
+ greater than the HttpSession.getMaxInactiveInterval() value will be treated
+ as a likely misconfiguration and converted to 0; i.e. replicate the
+ metadata on every request.
+ -->
+ <property name="maxUnreplicatedInterval">60</property>
+
+ </bean>
+
+ <!-- The WebMetaData to service mbean deployer -->
+ <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
+ </parameter>
+ <parameter>
+ <value>war</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
+ </parameter>
+ </uninstall>
+
+ <!-- Inject the MainDeployer for resolving cross deployment refs -->
+ <property name="mainDeployer"><inject bean="MainDeployer" /></property>
+
+ <property name="relativeOrder">2003</property>
+
+ <!-- FIXME Get this moved to TomcatService in deploy -->
+ <property name="configFile">
+ <value-factory bean="ServiceBindingManager" method="getResourceBinding">
+ <parameter>jboss.web:service=WebServer</parameter>
+ <parameter>${jboss.server.home.url}${/}deploy${/}jbossweb.sar${/}server.xml</parameter>
+ </value-factory>
+ </property>
+
+ <!-- You can configure a set of authenticators keyed by http-auth method
+ used. This will apply the same set of authenticators across all web
+ applications. You can override the set of authenticators at the web
+ application level by adding <authenticators> element to the respective
+ jboss-web.xml
+ -->
+ <property name="authenticators">
+ <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>BASIC</key>
+ <value>org.apache.catalina.authenticator.BasicAuthenticator</value>
+ </entry>
+ <entry>
+ <key>CLIENT-CERT</key>
+ <value>org.apache.catalina.authenticator.SSLAuthenticator</value>
+ </entry>
+ <entry>
+ <key>DIGEST</key>
+ <value>org.apache.catalina.authenticator.DigestAuthenticator</value>
+ </entry>
+ <entry>
+ <key>FORM</key>
+ <value>org.apache.catalina.authenticator.FormAuthenticator</value>
+ </entry>
+ <entry>
+ <key>NONE</key>
+ <value>org.apache.catalina.authenticator.NonLoginAuthenticator</value>
+ </entry>
+ </map>
+ </property>
+
+ <!-- The JAAS security domain to use in the absense of an explicit
+ security-domain specification in the war WEB-INF/jboss-web.xml
+ -->
+ <property name="defaultSecurityDomain">java:/jaas/jboss-web-policy</property>
+
+ <!-- Get the flag indicating if the normal Java2 parent first class
+ loading model should be used over the servlet 2.3 web container first
+ model.
+ -->
+ <property name="java2ClassLoadingCompliance">false</property>
+
+ <!-- This is NO LONGER supported this way and it will be completely removed for 6.x.
+ See JBAS-6914 for how you can achieve the same in 5.x with new MC JBossCL layer.
+
+ A flag indicating if the JBoss Loader should be used. This loader
+ uses a unified class loader as the class loader rather than the tomcat
+ specific class loader.
+ The default is false to ensure that wars have isolated class loading
+ for duplicate jars and jsp files.
+ <property name="useJBossWebLoader">false</property>
+ -->
+
+ <!-- The list of package prefixes that should not be loaded without
+ delegating to the parent class loader before trying the web app
+ class loader. The packages listed here are those tha are used by
+ the web container implementation and cannot be overriden. The format
+ is a comma separated list of the package names. There cannot be any
+ whitespace between the package prefixes.
+ This setting only applies when UseJBossWebLoader=false.
+ -->
+ <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property>
+
+ <property name="lenientEjbLink">true</property>
+
+ <!--Flag to delete the Work Dir on Context Destroy -->
+ <property name="deleteWorkDirOnContextDestroy">false</property>
+
+ <!--
+ Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
+ - org.jboss.web.tomcat.service.session.JBossCacheManager
+ -->
+ <property name="managerClass">org.jboss.web.tomcat.service.session.JBossCacheManager</property>
+
+ <!-- The name of the request property under with the authenticated JAAS
+ Subject is stored on successful authentication. If null or empty then
+ the Subject will not be stored.
+ -->
+ <!--
+ <property name="subjectAttributeName">j_subject</property>
+ -->
+
+ <!-- The SessionIdAlphabet is the set of characters used to create a session Id
+ It must be made up of exactly 65 unique characters
+ <property name="sessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-_</property>
+ -->
+
+ <property name="domain">jboss.web</property>
+ <!-- Specify a Bean for JBoss Security PolicyRegistration -->
+ <property name="policyRegistrationName">JBossSecurityPolicyRegistration</property>
+
+ <!-- Specify a SecurityManagement Wrapper -->
+ <property name="securityManagementName">JNDIBasedSecurityManagement</property>
+
+ <!-- Specify a SecurityContext FQN class name -->
+ <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property>
+ </bean>
+
+ <bean name="MergedJBossWebMetaDataDeployer"
+ class="org.jboss.web.deployers.MergedJBossWebMetaDataDeployer">
+ </bean>
+
+</deployment>
Property changes on: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss510/war-deployers-jboss-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/metadata-deployer-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/metadata-deployer-jboss-beans.xml 2009-10-12 08:30:32 UTC (rev 94665)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/metadata-deployer-jboss-beans.xml 2009-10-12 12:36:23 UTC (rev 94666)
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- MetaData configuration
-
- This add the DeploymentProvidedDUFilter which does not exist in jboss501
-
- $Id$
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- A reference metadata resolving deployer that creates and endpoint map
- for the deployments
- -->
- <bean name="ReferenceMetaDataResolverDeployer" class="org.jboss.deployment.MappedReferenceMetaDataResolverDeployer" />
-
- <!-- Generic scanning deployer - using javassist to do lookup -->
-
- <bean name="EarLibExcludeDeployer" class="org.jboss.deployment.EarLibExcludeDeployer" />
-
- <bean name="JBossMetaDataDUFilter" class="org.jboss.deployment.JBossMetaDataDeploymentUnitFilter" />
-
- <bean name="ScanningMetaDataDeployer" class="org.jboss.deployers.vfs.plugins.annotations.ScanningMetaDataDeployer" />
- <bean name="ScanningMetaDataDUFilter" class="org.jboss.deployers.vfs.plugins.annotations.ScanningDeploymentUnitFilter" />
-
- <bean name="JBossCustomDeployDUFilter" class="org.jboss.deployers.vfs.spi.structure.helpers.VirtualFileDeploymentUnitFilter">
- <constructor>
- <parameter>
- <bean class="org.jboss.deployment.FileNameVirtualFileFilter">
- <constructor>
- <parameter>
- <map keyClass="java.lang.String" valueClass="java.util.Set">
- <entry>
- <key>jbossweb.sar</key>
- <value>
- <null />
- </value>
- </entry>
- <entry>
- <key>console-mgr.sar</key>
- <value>
- <null />
- </value>
- </entry>
- <entry>
- <key>jbossws.sar</key>
- <value>
- <null />
- </value>
- </entry>
- <entry>
- <key>jmx-remoting.sar</key>
- <value>
- <null />
- </value>
- </entry>
- <entry>
- <key>jboss-local-jdbc.rar</key>
- <value>
- <null />
- </value>
- </entry>
- <entry>
- <key>jboss-xa-jdbc.rar</key>
- <value>
- <null />
- </value>
- </entry>
- <entry>
- <key>jms-ra.rar</key>
- <value>
- <null />
- </value>
- </entry>
- <entry>
- <key>mail-ra.rar</key>
- <value>
- <null />
- </value>
- </entry>
- <entry>
- <key>quartz-ra.rar</key>
- <value>
- <null />
- </value>
- </entry>
- <entry>
- <key>jmx-console.war</key>
- <value>
- <null />
- </value>
- </entry>
- </map>
- </parameter>
- </constructor>
- </bean>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="DeploymentProvidedDUFilter" class="org.jboss.osgi.deployer.helpers.DeploymentProvidedDeploymentUnitFilter" />
-
- <bean name="GenScanDeployer" class="org.jboss.deployers.vfs.plugins.annotations.FilteredAnnotationEnvironmentDeployer">
- <property name="filter">
- <bean class="org.jboss.deployment.ListDeploymentUnitFilter">
- <property name="filters">
- <list>
- <inject bean="DeploymentProvidedDUFilter" />
- <inject bean="JBossMetaDataDUFilter" />
- <inject bean="ScanningMetaDataDUFilter" />
- <inject bean="JBossCustomDeployDUFilter" />
- </list>
- </property>
- </bean>
- </property>
- </bean>
-
- <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.OptAnnotationMetaDataDeployer">
- <property name="metaDataCompleteIsDefault">false</property>
- </bean>
-
- <!--
- Extract annotations into a standard metadata view <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.AnnotationMetaDataDeployer"> <property
- name="metaDataCompleteIsDefault">false</property> </bean>
- -->
-
- <!--
- The schema location to JBossXB binding class mappings. We specify the dtd/xsd name of the schema as the location to work with legacy dtd as well as namespace based
- documents.
- -->
- <bean name="SchemaResolverConfig" class="org.jboss.xb.binding.sunday.unmarshalling.SchemaResolverConfig">
-
- <!-- schemaLocation to JBossXBuilder binding classes -->
- <property name="bindingClassesByLocations">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <!-- EarMetaData -->
- <entry>
- <key>application</key>
- <value>org.jboss.metadata.ear.spec.Ear13DTDMetaData</value>
- </entry>
- <entry>
- <key>application_1_2.dtd</key>
- <value>org.jboss.metadata.ear.spec.Ear13DTDMetaData</value>
- </entry>
- <entry>
- <key>application_1_3.dtd</key>
- <value>org.jboss.metadata.ear.spec.Ear13DTDMetaData</value>
- </entry>
- <entry>
- <key>application_1_4.xsd</key>
- <value>org.jboss.metadata.ear.spec.Ear14MetaData</value>
- </entry>
- <entry>
- <key>application_5.xsd</key>
- <value>org.jboss.metadata.ear.spec.Ear50MetaData</value>
- </entry>
- <!-- JBossAppMetaData -->
- <entry>
- <key>jboss-app</key>
- <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
- </entry>
- <entry>
- <key>jboss-app_3_0.dtd</key>
- <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
- </entry>
- <entry>
- <key>jboss-app_3_2.dtd</key>
- <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
- </entry>
- <entry>
- <key>jboss-app_4_0.dtd</key>
- <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
- </entry>
- <entry>
- <key>jboss-app_4_2.dtd</key>
- <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
- </entry>
- <entry>
- <key>jboss-app_5_0.dtd</key>
- <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
- </entry>
- <entry>
- <key>jboss-app_5_0.xsd</key>
- <value>org.jboss.metadata.ear.jboss.JBoss50AppMetaData</value>
- </entry>
-
- <!-- ApplicationClientMetaData -->
- <entry>
- <key>application-client</key>
- <value>org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData</value>
- </entry>
- <entry>
- <key>application-client_1_2.dtd</key>
- <value>org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData</value>
- </entry>
- <entry>
- <key>application-client_1_3.dtd</key>
- <value>org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData</value>
- </entry>
- <entry>
- <key>application-client_1_4.xsd</key>
- <value>org.jboss.metadata.client.spec.ApplicationClient14MetaData</value>
- </entry>
- <entry>
- <key>application-client_5.xsd</key>
- <value>org.jboss.metadata.client.spec.ApplicationClient5MetaData</value>
- </entry>
- <!-- ApplicationClientMetaData -->
- <entry>
- <key>jboss-client</key>
- <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
- </entry>
- <entry>
- <key>jboss-client_3_0.dtd</key>
- <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
- </entry>
- <entry>
- <key>jboss-client_3_2.dtd</key>
- <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
- </entry>
- <entry>
- <key>jboss-client_4_0.dtd</key>
- <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
- </entry>
- <entry>
- <key>jboss-client_4_2.dtd</key>
- <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
- </entry>
- <entry>
- <key>jboss-client_5_0.dtd</key>
- <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
- </entry>
- <entry>
- <key>jboss-client_5_0.xsd</key>
- <value>org.jboss.metadata.client.jboss.JBossClient5MetaData</value>
- </entry>
-
- <!-- EjbJarMetaData -->
- <entry>
- <key>ejb-jar</key>
- <value>org.jboss.metadata.ejb.spec.EjbJar20MetaData</value>
- </entry>
- <entry>
- <key>ejb-jar_1_1.dtd</key>
- <value>org.jboss.metadata.ejb.spec.EjbJar1xMetaData</value>
- </entry>
- <entry>
- <key>ejb-jar_2_0.dtd</key>
- <value>org.jboss.metadata.ejb.spec.EjbJar20MetaData</value>
- </entry>
- <entry>
- <key>ejb-jar_2_1.xsd</key>
- <value>org.jboss.metadata.ejb.spec.EjbJar21MetaData</value>
- </entry>
- <entry>
- <key>ejb-jar_3_0.xsd</key>
- <value>org.jboss.metadata.ejb.spec.EjbJar30MetaData</value>
- </entry>
-
- <!-- JBossMetaData -->
- <entry>
- <key>jboss</key>
- <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
- </entry>
- <entry>
- <key>jboss_3_0.dtd</key>
- <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
- </entry>
- <entry>
- <key>jboss_3_2.dtd</key>
- <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
- </entry>
- <entry>
- <key>jboss_4_0.dtd</key>
- <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
- </entry>
- <entry>
- <key>jboss_4_2.dtd</key>
- <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
- </entry>
- <entry>
- <key>jboss_5_0.dtd</key>
- <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
- </entry>
- <entry>
- <key>jboss_5_0.xsd</key>
- <value>org.jboss.metadata.ejb.jboss.JBoss50MetaData</value>
- </entry>
-
- <!-- WebMetaData -->
- <entry>
- <key>web-app</key>
- <value>org.jboss.metadata.web.spec.Web23MetaData</value>
- </entry>
- <entry>
- <key>web-app_2_2.dtd</key>
- <value>org.jboss.metadata.web.spec.Web23MetaData</value>
- </entry>
- <entry>
- <key>web-app_2_3.dtd</key>
- <value>org.jboss.metadata.web.spec.Web23MetaData</value>
- </entry>
- <entry>
- <key>web-app_2_4.xsd</key>
- <value>org.jboss.metadata.web.spec.Web24MetaData</value>
- </entry>
- <entry>
- <key>web-app_2_5.xsd</key>
- <value>org.jboss.metadata.web.spec.Web25MetaData</value>
- </entry>
- <!-- JBossWebMetaData -->
- <entry>
- <key>jboss-web</key>
- <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
- </entry>
- <entry>
- <key>jboss-web_3_0.dtd</key>
- <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
- </entry>
- <entry>
- <key>jboss-web_3_2.dtd</key>
- <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
- </entry>
- <entry>
- <key>jboss-web_4_0.dtd</key>
- <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
- </entry>
- <entry>
- <key>jboss-web_4_2.dtd</key>
- <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
- </entry>
- <entry>
- <key>jboss-web_5_0.dtd</key>
- <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
- </entry>
- <entry>
- <key>jboss-web_5_0.xsd</key>
- <value>org.jboss.metadata.web.jboss.JBoss50WebMetaData</value>
- </entry>
- <!-- PersistenceMetaData -->
- <entry>
- <key>persistence_1_0.xsd</key>
- <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
- </entry>
- </map>
- </property>
- </bean>
-
-</deployment>
Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml 2009-10-12 08:30:32 UTC (rev 94665)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml 2009-10-12 12:36:23 UTC (rev 94666)
@@ -72,17 +72,6 @@
<include name="message.txt"/>
</fileset>
</war>
- <!-- OSGi *.war deployments not supported jbossas less than jboss520 -->
- <war destfile="${tests.output.dir}/test-libs/example-webapp.jar"
- manifest="${tests.resources.dir}/webapp/MANIFEST.MF"
- webxml="${tests.resources.dir}/webapp/web.xml">
- <classes dir="${tests.classes.dir}">
- <include name="**/example/webapp/bundle/*.class"/>
- </classes>
- <fileset dir="${tests.resources.dir}/webapp">
- <include name="message.txt"/>
- </fileset>
- </war>
<!-- xml/jaxb -->
<bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/example-xml-jaxb.jar" files="${tests.resources.dir}/xml/jaxb/example-xml-jaxb.bnd" />
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-12 08:30:32 UTC (rev 94665)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-12 12:36:23 UTC (rev 94666)
@@ -57,15 +57,7 @@
runtime = osgiTestHelper.getDefaultRuntime();
runtime.addCapability(new WebAppCapability());
- OSGiBundle bundle;
-
- // OSGi *.war deployments not supported jbossas less than jboss520
- String targetContainer = osgiTestHelper.getTargetContainer();
- if ("jboss501".equals(targetContainer) || "jboss510".equals(targetContainer))
- bundle = runtime.installBundle("example-webapp.jar");
- else
- bundle = runtime.installBundle("example-webapp.war");
-
+ OSGiBundle bundle = runtime.installBundle("example-webapp.war");
bundle.start();
}
16 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r94645 - in projects/jboss-osgi/trunk/testsuite/example: src/test/java/org/jboss/test/osgi/example/webapp and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-10 18:21:56 -0400 (Sat, 10 Oct 2009)
New Revision: 94645
Modified:
projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
Log:
OSGi *.war deployments not supported on jbossas less than jboss520
Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml 2009-10-10 21:45:59 UTC (rev 94644)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml 2009-10-10 22:21:56 UTC (rev 94645)
@@ -72,6 +72,17 @@
<include name="message.txt"/>
</fileset>
</war>
+ <!-- OSGi *.war deployments not supported jbossas less than jboss520 -->
+ <war destfile="${tests.output.dir}/test-libs/example-webapp.jar"
+ manifest="${tests.resources.dir}/webapp/MANIFEST.MF"
+ webxml="${tests.resources.dir}/webapp/web.xml">
+ <classes dir="${tests.classes.dir}">
+ <include name="**/example/webapp/bundle/*.class"/>
+ </classes>
+ <fileset dir="${tests.resources.dir}/webapp">
+ <include name="message.txt"/>
+ </fileset>
+ </war>
<!-- xml/jaxb -->
<bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/example-xml-jaxb.jar" files="${tests.resources.dir}/xml/jaxb/example-xml-jaxb.bnd" />
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-10 21:45:59 UTC (rev 94644)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-10 22:21:56 UTC (rev 94645)
@@ -33,6 +33,7 @@
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.junit.AfterClass;
import org.junit.BeforeClass;
@@ -44,17 +45,27 @@
* @author thomas.diesler(a)jboss.com
* @since 06-Oct-2009
*/
-public class WebAppTestCase
+public class WebAppTestCase extends OSGiTest
{
private static OSGiRuntime runtime;
@BeforeClass
public static void setUpClass() throws Exception
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ OSGiTestHelper osgiTestHelper = new OSGiTestHelper();
+
+ runtime = osgiTestHelper.getDefaultRuntime();
runtime.addCapability(new WebAppCapability());
- OSGiBundle bundle = runtime.installBundle("example-webapp.war");
+ OSGiBundle bundle;
+
+ // OSGi *.war deployments not supported jbossas less than jboss520
+ String targetContainer = osgiTestHelper.getTargetContainer();
+ if ("jboss501".equals(targetContainer) || "jboss510".equals(targetContainer))
+ bundle = runtime.installBundle("example-webapp.jar");
+ else
+ bundle = runtime.installBundle("example-webapp.war");
+
bundle.start();
}
@@ -69,7 +80,7 @@
{
assertEquals("Hello from Resource", getHttpResponse("/message.txt"));
}
-
+
@Test
public void testServletAccess() throws Exception
{
@@ -85,7 +96,7 @@
private String getHttpResponse(String reqPath) throws Exception
{
URL url = new URL("http://" + runtime.getServerHost() + ":8090/example-webapp" + reqPath);
-
+
int timeout = 50;
String line = null;
IOException lastException = null;
@@ -102,10 +113,10 @@
Thread.sleep(200);
}
}
-
+
if (line == null && lastException != null)
throw lastException;
-
+
return line;
}
}
\ No newline at end of file
16 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r94643 - in projects/jboss-osgi: projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration and 7 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-10 17:43:48 -0400 (Sat, 10 Oct 2009)
New Revision: 94643
Added:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/OSGiConstants.java
Removed:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/Constants.java
Modified:
projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java
projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleClassLoaderDeployer.java
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartLevelDeployer.java
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartStopDeployer.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedFramework.java
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiDeployersWrapper.java
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java
Log:
Mark osgi deplyments with bundle symbolic name in deployment unit
Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java
===================================================================
--- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -23,7 +23,7 @@
//$Id$
-import static org.jboss.osgi.spi.Constants.OSGI_HOME;
+import static org.jboss.osgi.spi.OSGiConstants.OSGI_HOME;
import java.io.File;
import java.net.MalformedURLException;
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -48,7 +48,7 @@
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.osgi.spi.Constants;
+import org.jboss.osgi.spi.OSGiConstants;
import org.jboss.osgi.spi.management.MicrocontainerServiceMBean;
import org.jboss.osgi.spi.service.DeployerService;
import org.jboss.osgi.spi.service.DeploymentRegistryService;
@@ -159,8 +159,8 @@
depList.add(deployment);
MutableAttachments att = (MutableAttachments)deployment.getPredeterminedManagedObjects();
- att.addAttachment(Constants.PROPERTY_START_LEVEL, new Integer(dep.getStartLevel()));
- att.addAttachment(Constants.PROPERTY_AUTO_START, new Boolean(dep.isAutoStart()));
+ att.addAttachment(OSGiConstants.PROPERTY_START_LEVEL, new Integer(dep.getStartLevel()));
+ att.addAttachment(OSGiConstants.PROPERTY_AUTO_START, new Boolean(dep.isAutoStart()));
mainDeployer.addDeployment(deployment);
}
Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml 2009-10-10 21:43:48 UTC (rev 94643)
@@ -31,7 +31,7 @@
<properties>
<version.jboss.deployers>2.0.8.GA</version.jboss.deployers>
- <version.jboss.osgi.spi>1.0.1</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.2-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>r4v42</version.osgi>
</properties>
Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleClassLoaderDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleClassLoaderDeployer.java 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleClassLoaderDeployer.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -31,7 +31,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnitFilter;
import org.jboss.osgi.deployer.helpers.BundleDeploymentUnitFilter;
import org.jboss.osgi.deployer.helpers.PackageAdminDependencyItem;
-import org.jboss.osgi.spi.Constants;
+import org.jboss.osgi.spi.OSGiConstants;
import org.jboss.osgi.spi.util.BundleClassLoader;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -68,7 +68,7 @@
unit.addAttachment(ClassLoaderFactory.class, factory);
// create dependency items
- String propStart = systemContext.getProperty(Constants.PROPERTY_DEFERRED_START);
+ String propStart = systemContext.getProperty(OSGiConstants.PROPERTY_DEFERRED_START);
if (Boolean.parseBoolean(propStart != null ? propStart : "true") == false)
unit.addIDependOn(new PackageAdminDependencyItem(systemContext, bundle));
Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -28,6 +28,7 @@
import org.jboss.deployers.vfs.spi.deployer.ManifestDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.osgi.spi.OSGiConstants;
import org.jboss.virtual.VirtualFile;
import org.osgi.framework.Constants;
@@ -41,31 +42,36 @@
*/
public class BundleMetaDataDeployer extends ManifestDeployer<BundleMetaData>
{
- public BundleMetaDataDeployer()
- {
- super(BundleMetaData.class);
- }
+ public BundleMetaDataDeployer()
+ {
+ super(BundleMetaData.class);
+ }
- @Override
- protected BundleMetaData parse(VFSDeploymentUnit unit, VirtualFile file, BundleMetaData root) throws Exception
- {
- BundleMetaData metaData = super.parse(unit, file, root);
- if (metaData != null)
- {
- metaData.setBundleLocation(unit.getRoot().toURL());
- log.debug("Bundle-SymbolicName: " + metaData.getSymbolicName() + " in " + file);
- }
- return metaData;
- }
-
- @Override
- protected BundleMetaData createMetaData(Manifest manifest) throws Exception
- {
- Attributes attribs = manifest.getMainAttributes();
- String symbolicName = attribs.getValue(Constants.BUNDLE_SYMBOLICNAME);
- if (symbolicName != null)
- return new BundleMetaData(symbolicName);
+ @Override
+ protected BundleMetaData parse(VFSDeploymentUnit unit, VirtualFile file, BundleMetaData root) throws Exception
+ {
+ BundleMetaData metaData = super.parse(unit, file, root);
+ if (metaData != null)
+ {
+ String symbolicName = metaData.getSymbolicName();
+ log.debug("Bundle-SymbolicName: " + symbolicName + " in " + file);
- return null;
- }
+ metaData.setBundleLocation(unit.getRoot().toURL());
+
+ // Add a marker that this is an OSGi deployment
+ unit.addAttachment(OSGiConstants.KEY_BUNDLE_SYMBOLIC_NAME, symbolicName);
+ }
+ return metaData;
+ }
+
+ @Override
+ protected BundleMetaData createMetaData(Manifest manifest) throws Exception
+ {
+ Attributes attribs = manifest.getMainAttributes();
+ String symbolicName = attribs.getValue(Constants.BUNDLE_SYMBOLICNAME);
+ if (symbolicName != null)
+ return new BundleMetaData(symbolicName);
+
+ return null;
+ }
}
Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartLevelDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartLevelDeployer.java 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartLevelDeployer.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -21,12 +21,12 @@
*/
package org.jboss.osgi.deployer;
-// $Id: $
+// $Id:$
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.osgi.spi.Constants;
+import org.jboss.osgi.spi.OSGiConstants;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.service.startlevel.StartLevel;
@@ -50,7 +50,7 @@
public BundleStartLevelDeployer()
{
super(Bundle.class);
- addOutput(Constants.PROPERTY_START_LEVEL);
+ addOutput(OSGiConstants.PROPERTY_START_LEVEL);
}
public void setSystemContext(BundleContext systemContext)
@@ -60,7 +60,7 @@
public void deploy(DeploymentUnit unit, Bundle bundle) throws DeploymentException
{
- Integer propStart = unit.getAttachment(Constants.PROPERTY_START_LEVEL, Integer.class);
+ Integer propStart = unit.getAttachment(OSGiConstants.PROPERTY_START_LEVEL, Integer.class);
StartLevel startLevel = getStartLevel();
if (propStart != null && startLevel != null)
{
Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartStopDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartStopDeployer.java 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartStopDeployer.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -30,7 +30,7 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.osgi.spi.Constants;
+import org.jboss.osgi.spi.OSGiConstants;
import org.jboss.osgi.spi.logging.ExportedPackageHelper;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -56,7 +56,7 @@
public BundleStartStopDeployer()
{
super(Bundle.class);
- addInput(Constants.PROPERTY_START_LEVEL);
+ addInput(OSGiConstants.PROPERTY_START_LEVEL);
}
public void setSystemContext(BundleContext systemContext)
@@ -66,10 +66,10 @@
public void deploy(DeploymentUnit unit, Bundle bundle) throws DeploymentException
{
- Boolean propAutoStart = unit.getAttachment(Constants.PROPERTY_AUTO_START, Boolean.class);
+ Boolean propAutoStart = unit.getAttachment(OSGiConstants.PROPERTY_AUTO_START, Boolean.class);
if (propAutoStart == null || Boolean.TRUE.equals(propAutoStart))
{
- String propDeferredStart = systemContext.getProperty(Constants.PROPERTY_DEFERRED_START);
+ String propDeferredStart = systemContext.getProperty(OSGiConstants.PROPERTY_DEFERRED_START);
if (Boolean.parseBoolean(propDeferredStart != null ? propDeferredStart : "true") == true)
{
deferredStart(unit, bundle);
Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/Constants.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/Constants.java 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/Constants.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -1,68 +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;
-
-//$Id$
-
-/**
- * JBossOSGi Constants
- *
- * @author thomas.diesler(a)jboss.com
- * @since 04-Mar-2009
- */
-public interface Constants
-{
- /** The JBossOSGi domain 'jboss.osgi' */
- String DOMAIN_NAME = "jboss.osgi";
-
- /**
- * If set to 'true' bundles can be deployed in any order. Deployed bundle will get started when their dependencies can be resolved.
- * If set to 'false' bundles must be deployed in the order that is required to start them.
- *
- * The default is 'true'
- */
- String PROPERTY_DEFERRED_START = "org.jboss.osgi.deferred.start";
-
- /**
- * If set to 'true' bundles are started automatically.
- *
- * The default is 'false'
- */
- String PROPERTY_AUTO_START = "org.jboss.osgi.auto.start";
-
- /**
- * Specifies the start level for a bundle.
- *
- * The default is '0'
- */
- String PROPERTY_START_LEVEL = "org.jboss.osgi.start.level";
-
- /**
- * The JBossOSGi runtime system property that denotes the path to the runtime
- */
- String OSGI_HOME = "osgi.home";
-
- /**
- * The JBossOSGi runtime system property that denotes the path to the active runtime profile
- */
- String OSGI_SERVER_HOME = "osgi.server.home";
-}
Copied: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/OSGiConstants.java (from rev 94498, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/Constants.java)
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/OSGiConstants.java (rev 0)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/OSGiConstants.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -0,0 +1,74 @@
+/*
+ * 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;
+
+//$Id$
+
+/**
+ * JBossOSGi Constants
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 04-Mar-2009
+ */
+public interface OSGiConstants
+{
+ /** The JBossOSGi domain 'jboss.osgi' */
+ String DOMAIN_NAME = "jboss.osgi";
+
+ /**
+ * If set to 'true' bundles can be deployed in any order. Deployed bundle will get started when their dependencies can be resolved.
+ * If set to 'false' bundles must be deployed in the order that is required to start them.
+ *
+ * The default is 'true'
+ */
+ String PROPERTY_DEFERRED_START = "org.jboss.osgi.deferred.start";
+
+ /**
+ * If set to 'true' bundles are started automatically.
+ *
+ * The default is 'false'
+ */
+ String PROPERTY_AUTO_START = "org.jboss.osgi.auto.start";
+
+ /**
+ * Specifies the start level for a bundle.
+ *
+ * The default is '0'
+ */
+ String PROPERTY_START_LEVEL = "org.jboss.osgi.start.level";
+
+ /**
+ * The JBossOSGi runtime system property that denotes the path to the runtime
+ */
+ String OSGI_HOME = "osgi.home";
+
+ /**
+ * The JBossOSGi runtime system property that denotes the path to the active runtime profile
+ */
+ String OSGI_SERVER_HOME = "osgi.server.home";
+
+ /**
+ * A JBossOSGi deployment unit attachment key that containe the bundle's symbolic name.
+ */
+ String KEY_BUNDLE_SYMBOLIC_NAME = "org.jboss.osgi.bundle.symbolic.name";
+
+}
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -23,8 +23,8 @@
//$Id$
-import static org.jboss.osgi.spi.Constants.OSGI_HOME;
-import static org.jboss.osgi.spi.Constants.OSGI_SERVER_HOME;
+import static org.jboss.osgi.spi.OSGiConstants.OSGI_HOME;
+import static org.jboss.osgi.spi.OSGiConstants.OSGI_SERVER_HOME;
import java.io.File;
import java.io.IOException;
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -29,7 +29,7 @@
import javax.management.ObjectName;
-import org.jboss.osgi.spi.Constants;
+import org.jboss.osgi.spi.OSGiConstants;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Version;
@@ -52,7 +52,7 @@
long id = bundle.getBundleId();
String name = bundle.getSymbolicName();
Version version = bundle.getVersion();
- this.oname = ObjectNameFactory.create(Constants.DOMAIN_NAME + ":id=" + id + ",bundle=" + name + ",version=" + version);
+ this.oname = ObjectNameFactory.create(OSGiConstants.DOMAIN_NAME + ":id=" + id + ",bundle=" + name + ",version=" + version);
}
public ObjectName getObjectName()
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedFramework.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedFramework.java 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedFramework.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -37,7 +37,7 @@
import javax.management.QueryExp;
import org.jboss.logging.Logger;
-import org.jboss.osgi.spi.Constants;
+import org.jboss.osgi.spi.OSGiConstants;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
@@ -82,7 +82,7 @@
{
ObjectName oname = null;
- ObjectName pattern = ObjectNameFactory.create(Constants.DOMAIN_NAME + ":bundle=" + symbolicName + ",*");
+ ObjectName pattern = ObjectNameFactory.create(OSGiConstants.DOMAIN_NAME + ":bundle=" + symbolicName + ",*");
Set<ObjectName> names = mbeanServer.queryNames(pattern, null);
if (names.size() > 0)
@@ -102,7 +102,7 @@
{
ObjectName oname = null;
- ObjectName pattern = ObjectNameFactory.create(Constants.DOMAIN_NAME + ":id=" + bundleId + ",*");
+ ObjectName pattern = ObjectNameFactory.create(OSGiConstants.DOMAIN_NAME + ":id=" + bundleId + ",*");
Set<ObjectName> names = mbeanServer.queryNames(pattern, null);
if (names.size() > 0)
@@ -118,7 +118,7 @@
// ObjectName pattern = ObjectNameFactory.create(Constants.DOMAIN_NAME + ":bundle=*,*");
// Set<ObjectName> names = mbeanServer.queryNames(pattern, null);
- ObjectName pattern = ObjectNameFactory.create(Constants.DOMAIN_NAME + ":*");
+ ObjectName pattern = ObjectNameFactory.create(OSGiConstants.DOMAIN_NAME + ":*");
Set<ObjectName> names = mbeanServer.queryNames(pattern, new IsBundleQueryExp());
return names;
}
Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -21,7 +21,7 @@
*/
package org.jboss.osgi.framework.bundle;
-import static org.jboss.osgi.spi.Constants.PROPERTY_AUTO_START;
+import static org.jboss.osgi.spi.OSGiConstants.PROPERTY_AUTO_START;
import java.io.File;
import java.io.FileOutputStream;
Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiDeployersWrapper.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiDeployersWrapper.java 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiDeployersWrapper.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -21,7 +21,7 @@
*/
package org.jboss.osgi.framework.deployers;
-import static org.jboss.osgi.spi.Constants.PROPERTY_AUTO_START;
+import static org.jboss.osgi.spi.OSGiConstants.PROPERTY_AUTO_START;
import java.util.ArrayList;
import java.util.Collection;
Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java 2009-10-10 16:18:10 UTC (rev 94642)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java 2009-10-10 21:43:48 UTC (rev 94643)
@@ -25,8 +25,11 @@
import java.util.jar.Attributes.Name;
import org.jboss.deployers.vfs.spi.deployer.ManifestDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.osgi.framework.metadata.OSGiMetaData;
import org.jboss.osgi.framework.metadata.internal.AbstractOSGiMetaData;
+import org.jboss.osgi.spi.OSGiConstants;
+import org.jboss.virtual.VirtualFile;
import org.osgi.framework.Constants;
/**
@@ -45,10 +48,25 @@
public OSGiManifestParsingDeployer()
{
super(OSGiMetaData.class);
- setTopLevelOnly(true); // REVIEW allow OSGi sub-deployments? Probably not?
+ setTopLevelOnly(true);
}
@Override
+ protected OSGiMetaData parse(VFSDeploymentUnit unit, VirtualFile file, OSGiMetaData root) throws Exception
+ {
+ OSGiMetaData metaData = super.parse(unit, file, root);
+ if (metaData != null)
+ {
+ String symbolicName = metaData.getBundleSymbolicName();
+ log.debug("Bundle-SymbolicName: " + symbolicName + " in " + file);
+
+ // Add a marker that this is an OSGi deployment
+ unit.addAttachment(OSGiConstants.KEY_BUNDLE_SYMBOLIC_NAME, symbolicName);
+ }
+ return metaData;
+ }
+
+ @Override
protected OSGiMetaData createMetaData(Manifest manifest) throws Exception
{
// To be a true OSGi bundle it must have a bundle symbolic name in the manfiest
16 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r94641 - projects/jboss-osgi/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-10 11:16:32 -0400 (Sat, 10 Oct 2009)
New Revision: 94641
Modified:
projects/jboss-osgi/trunk/pom.xml
Log:
Update jboss-osgi-hotdeploy
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-10-10 15:15:43 UTC (rev 94640)
+++ projects/jboss-osgi/trunk/pom.xml 2009-10-10 15:16:32 UTC (rev 94641)
@@ -47,7 +47,7 @@
<version.jboss.osgi.common>1.0.2-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
<version.jboss.osgi.framework>1.0.0.Alpha1</version.jboss.osgi.framework>
- <version.jboss.osgi.hotdeploy>1.0.1</version.jboss.osgi.hotdeploy>
+ <version.jboss.osgi.hotdeploy>1.0.2-SNAPSHOT</version.jboss.osgi.hotdeploy>
<version.jboss.osgi.husky>1.0.1-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP2</version.jboss.osgi.jaxb>
<version.jboss.osgi.jmx>1.0.1</version.jboss.osgi.jmx>
16 years, 2 months
- 1
- 0