JBoss-OSGI SVN: r96820 - in projects/jboss-osgi/projects/bundles/jmx/tags: jboss-osgi-jmx-1.0.2 and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-24 07:05:27 -0500 (Tue, 24 Nov 2009)
New Revision: 96820
Added:
projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2/
projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2/pom.xml
Removed:
projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2/pom.xml
Log:
[maven-release-plugin] copy for tag jboss-osgi-jmx-1.0.2
Copied: projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2 (from rev 96818, projects/jboss-osgi/projects/bundles/jmx/trunk)
Property changes on: projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2
___________________________________________________________________
Name: svn:ignore
+ target
felix-cache
Name: svn:mergeinfo
+
Deleted: projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-11-24 12:03:33 UTC (rev 96818)
+++ projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2/pom.xml 2009-11-24 12:05:27 UTC (rev 96820)
@@ -1,155 +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 Reactor - JMX</name>
- <description>The JBossOSGi Management</description>
-
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <packaging>bundle</packaging>
-
- <version>1.0.2-SNAPSHOT</version>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
- </parent>
-
- <!-- Subversion -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
- </scm>
-
- <!-- Properties -->
- <properties>
- <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
- <version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi>
- <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
- <version.osgi>4.2.0</version.osgi>
- </properties>
-
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</artifactId>
- <version>${version.jboss.osgi.common.core}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <version>${version.jboss.osgi.jndi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
- </dependency>
-
- <!-- OSGi Dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.jmx.internal.JMXServiceActivator</Bundle-Activator>
- <Export-Package>
- org.jboss.osgi.jmx;version=${version}
- </Export-Package>
- <Import-Package>
-
- <!-- system -->
- javax.management*,
- javax.naming,
- javax.naming.spi,
-
- <!-- jboss-osgi -->
- org.jboss.osgi.common.log;version=1.0,
- org.jboss.osgi.spi.capability;version=1.0,
- org.jboss.osgi.spi.management;version=1.0,
-
- <!-- osgi -->
- org.osgi.framework;version=1.4,
- org.osgi.service.log,
- org.osgi.service.packageadmin,
- org.osgi.util.tracker,
-
- <!-- logging -->
- org.slf4j,
-
- <!-- FIXME optional -->
- org.jboss.osgi.jndi,
- org.jboss.net.sockets,
- org.jnp.interfaces,
-
- <!--
- org.jboss.osgi.jndi;resolution:=optional,
- org.jboss.net.sockets;resolution:=optional,
- org.jnp.interfaces;resolution:=optional,
- -->
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <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>
-
-</project>
Copied: projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2/pom.xml (from rev 96819, projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/bundles/jmx/tags/jboss-osgi-jmx-1.0.2/pom.xml 2009-11-24 12:05:27 UTC (rev 96820)
@@ -0,0 +1,155 @@
+<?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 Reactor - JMX</name>
+ <description>The JBossOSGi Management</description>
+
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <packaging>bundle</packaging>
+
+ <version>1.0.2</version>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.4</version>
+ </parent>
+
+ <!-- Subversion -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
+ <url>http://fisheye.jboss.com/qsearch/JBossOSGi/tags/jboss-osgi-jmx-1.0.2</url>
+ </scm>
+
+ <!-- Properties -->
+ <properties>
+ <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
+ <version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi>
+ <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+ <version.osgi>4.2.0</version.osgi>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common-core</artifactId>
+ <version>${version.jboss.osgi.common.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-Activator>org.jboss.osgi.jmx.internal.JMXServiceActivator</Bundle-Activator>
+ <Export-Package>
+ org.jboss.osgi.jmx;version=${version}
+ </Export-Package>
+ <Import-Package>
+
+ <!-- system -->
+ javax.management*,
+ javax.naming,
+ javax.naming.spi,
+
+ <!-- jboss-osgi -->
+ org.jboss.osgi.common.log;version=1.0,
+ org.jboss.osgi.spi.capability;version=1.0,
+ org.jboss.osgi.spi.management;version=1.0,
+
+ <!-- osgi -->
+ org.osgi.framework;version=1.4,
+ org.osgi.service.log,
+ org.osgi.service.packageadmin,
+ org.osgi.util.tracker,
+
+ <!-- logging -->
+ org.slf4j,
+
+ <!-- FIXME optional -->
+ org.jboss.osgi.jndi,
+ org.jboss.net.sockets,
+ org.jnp.interfaces,
+
+ <!--
+ org.jboss.osgi.jndi;resolution:=optional,
+ org.jboss.net.sockets;resolution:=optional,
+ org.jnp.interfaces;resolution:=optional,
+ -->
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <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>
+
+</project>
14 years, 7 months
JBoss-OSGI SVN: r96818 - in projects/jboss-osgi: trunk/reactor and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-24 07:03:33 -0500 (Tue, 24 Nov 2009)
New Revision: 96818
Added:
projects/jboss-osgi/projects/bundles/jmx/trunk/
Removed:
projects/jboss-osgi/trunk/reactor/jmx/
Log:
Decouple jmx from reactor
Copied: projects/jboss-osgi/projects/bundles/jmx/trunk (from rev 96817, projects/jboss-osgi/trunk/reactor/jmx)
14 years, 7 months
JBoss-OSGI SVN: r96817 - in projects/jboss-osgi/trunk: reactor and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-24 07:02:25 -0500 (Tue, 24 Nov 2009)
New Revision: 96817
Modified:
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/reactor/jmx/pom.xml
projects/jboss-osgi/trunk/reactor/pom.xml
Log:
Decouple from jmx from reactor
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-11-24 12:02:08 UTC (rev 96816)
+++ projects/jboss-osgi/trunk/pom.xml 2009-11-24 12:02:25 UTC (rev 96817)
@@ -56,7 +56,7 @@
<version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
<version.jboss.osgi.framework>1.0.0.Alpha2-SNAPSHOT</version.jboss.osgi.framework>
<version.jboss.osgi.hotdeploy>1.0.3-SNAPSHOT</version.jboss.osgi.hotdeploy>
- <version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky>
+ <version.jboss.osgi.husky>1.0.2</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP2</version.jboss.osgi.jaxb>
<version.jboss.osgi.jmx>1.0.2-SNAPSHOT</version.jboss.osgi.jmx>
<version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi>
Modified: projects/jboss-osgi/trunk/reactor/jmx/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/jmx/pom.xml 2009-11-24 12:02:08 UTC (rev 96816)
+++ projects/jboss-osgi/trunk/reactor/jmx/pom.xml 2009-11-24 12:02:25 UTC (rev 96817)
@@ -26,34 +26,54 @@
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta5</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.4</version>
</parent>
+ <!-- Subversion -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
+ <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
+ </scm>
+
<!-- Properties -->
<properties>
+ <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
+ <version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi>
+ <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+ <version.osgi>4.2.0</version.osgi>
</properties>
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
+ <artifactId>jboss-osgi-common-core</artifactId>
+ <version>${version.jboss.osgi.common.core}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</artifactId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
+ </dependency>
<!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -132,11 +152,4 @@
</plugins>
</build>
- <!-- Subversion -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi/projects/bundles/jmx/trunk</url>
- </scm>
-
</project>
Modified: projects/jboss-osgi/trunk/reactor/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/pom.xml 2009-11-24 12:02:08 UTC (rev 96816)
+++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-11-24 12:02:25 UTC (rev 96817)
@@ -43,7 +43,6 @@
</parent>
<modules>
- <module>jmx</module>
<module>jta</module>
<module>blueprint</module>
</modules>
14 years, 7 months
JBoss-OSGI SVN: r96816 - projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle.
by jboss-osgi-commits＠lists.jboss.org
Author: alesj
Date: 2009-11-24 07:02:08 -0500 (Tue, 24 Nov 2009)
New Revision: 96816
Added:
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/ContextRegistryAction.java
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceAction.java
Modified:
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiControllerContextActions.java
Log:
[JBOSGI-141]; add context registry action.
Copied: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/ContextRegistryAction.java (from rev 96803, projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiControllerContextActions.java)
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/ContextRegistryAction.java (rev 0)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/ContextRegistryAction.java 2009-11-24 12:02:08 UTC (rev 96816)
@@ -0,0 +1,88 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.framework.bundle;
+
+import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.tracker.ContextRegistry;
+
+/**
+ * Register osgi service into context registry.
+ *
+ * @author <a href="ales.justin(a)jboss.org">Ales Justin</a>
+ */
+class ContextRegistryAction extends OSGiServiceAction
+{
+ /**
+ * Get context registry.
+ *
+ * @param context the context
+ * @return context registry or null if cannot be applied
+ */
+ protected ContextRegistry getContextRegistry(ControllerContext context)
+ {
+ Controller controller = context.getController();
+ return (controller instanceof ContextRegistry) ? ContextRegistry.class.cast(controller) : null;
+ }
+
+ /**
+ * Register / unregister contex under exposed classes to context registry.
+ *
+ * @param context the context
+ * @param register the registry
+ * @throws Throwable for any error
+ */
+ protected void handleContext(OSGiServiceState context, boolean register) throws Throwable
+ {
+ ContextRegistry registry = getContextRegistry(context);
+ if (registry != null)
+ {
+ ClassLoader cl = context.getClassLoader();
+ String[] classes = context.getClasses();
+ for (String clazz : classes)
+ {
+ Class<?> exposedClass = cl.loadClass(clazz);
+ if (register)
+ registry.registerInstantiatedContext(context, exposedClass);
+ else
+ registry.unregisterInstantiatedContext(context, exposedClass);
+ }
+ }
+ }
+
+ protected void installAction(OSGiServiceState context) throws Throwable
+ {
+ handleContext(context, true);
+ }
+
+ protected void uninstallAction(OSGiServiceState context)
+ {
+ try
+ {
+ handleContext(context, false);
+ }
+ catch (Throwable t)
+ {
+ log.warn("Ignoring exception at un-registering context: " + t);
+ }
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiControllerContextActions.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiControllerContextActions.java 2009-11-24 11:47:27 UTC (rev 96815)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiControllerContextActions.java 2009-11-24 12:02:08 UTC (rev 96816)
@@ -21,7 +21,11 @@
*/
package org.jboss.osgi.framework.bundle;
-import org.jboss.dependency.spi.ControllerContext;
+import java.util.Collections;
+import java.util.Map;
+
+import org.jboss.dependency.plugins.AbstractControllerContextActions;
+import org.jboss.dependency.plugins.action.ControllerContextAction;
import org.jboss.dependency.spi.ControllerContextActions;
import org.jboss.dependency.spi.ControllerState;
@@ -30,15 +34,22 @@
*
* @author <a href="ales.justin(a)jboss.org">Ales Justin</a>
*/
-class OSGiControllerContextActions implements ControllerContextActions
+class OSGiControllerContextActions extends AbstractControllerContextActions
{
static final ControllerContextActions ACTIONS = new OSGiControllerContextActions();
-
- public void install(ControllerContext context, ControllerState fromState, ControllerState toState) throws Throwable
+
+ private OSGiControllerContextActions()
{
+ super(getActions());
}
- public void uninstall(ControllerContext context, ControllerState fromState, ControllerState toState)
+ /**
+ * Get actions.
+ *
+ * @return the actions
+ */
+ private static Map<ControllerState, ControllerContextAction> getActions()
{
+ return Collections.<ControllerState, ControllerContextAction>singletonMap(ControllerState.INSTANTIATED, new ContextRegistryAction());
}
}
\ No newline at end of file
Added: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceAction.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceAction.java (rev 0)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceAction.java 2009-11-24 12:02:08 UTC (rev 96816)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.framework.bundle;
+
+import org.jboss.dependency.plugins.action.SimpleControllerContextAction;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.logging.Logger;
+
+/**
+ * Handle OSGi service context.
+ *
+ * @author <a href="ales.justin(a)jboss.org">Ales Justin</a>
+ */
+public abstract class OSGiServiceAction extends SimpleControllerContextAction<OSGiServiceState>
+{
+ protected Logger log = Logger.getLogger(getClass());
+
+ protected OSGiServiceState contextCast(ControllerContext context)
+ {
+ return OSGiServiceState.class.cast(context);
+ }
+
+ protected boolean validateContext(ControllerContext context)
+ {
+ return (context instanceof OSGiServiceState);
+ }
+}
\ No newline at end of file
14 years, 7 months
JBoss-OSGI SVN: r96815 - in projects/jboss-osgi/projects/bundles/husky/trunk: harness and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-24 06:47:27 -0500 (Tue, 24 Nov 2009)
New Revision: 96815
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-11-24 11:47:11 UTC (rev 96814)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-11-24 11:47:27 UTC (rev 96815)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-11-24 11:47:11 UTC (rev 96814)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-11-24 11:47:27 UTC (rev 96815)
@@ -22,7 +22,7 @@
<artifactId>jboss-osgi-husky-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -33,9 +33,9 @@
<!-- Subversion -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi/tags/jboss-osgi-husky-parent-1...</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 -->
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-11-24 11:47:11 UTC (rev 96814)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-11-24 11:47:27 UTC (rev 96815)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
</parent>
<!-- Properties -->
14 years, 7 months
JBoss-OSGI SVN: r96814 - in projects/jboss-osgi/projects/bundles/husky/tags: jboss-osgi-husky-parent-1.0.2 and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-24 06:47:11 -0500 (Tue, 24 Nov 2009)
New Revision: 96814
Added:
projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/
projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/harness/pom.xml
projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/pom.xml
projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/testsuite/pom.xml
Removed:
projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/harness/pom.xml
projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/pom.xml
projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/testsuite/pom.xml
Log:
[maven-release-plugin] copy for tag jboss-osgi-husky-parent-1.0.2
Copied: projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2 (from rev 96811, projects/jboss-osgi/projects/bundles/husky/trunk)
Property changes on: projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2
___________________________________________________________________
Name: svn:ignore
+ target
Name: svn:mergeinfo
+
Deleted: projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/harness/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-11-24 11:35:51 UTC (rev 96811)
+++ projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/harness/pom.xml 2009-11-24 11:47:11 UTC (rev 96814)
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, JUnit testing for OSGi bundles -->
- <!-- -->
- <!-- 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 Bundles - Husky Implementation</name>
-
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky</artifactId>
- <packaging>bundle</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- </parent>
-
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-deployment</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <!-- Provided Dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.husky.runtime.osgi.HuskyActivator</Bundle-Activator>
- <Export-Package>
- org.jboss.osgi.husky;version=${version},
- org.jboss.osgi.testing;version=${version},
- </Export-Package>
- <Import-Package>
- javax.management,
- javax.naming,
- org.jboss.osgi.deployment.interceptor;version="[1.0,1.1)",
- org.jboss.osgi.spi;version="[1.0,1.1)",
- org.jboss.osgi.spi.capability;version="[1.0,1.1)",
- org.jboss.osgi.spi.management;version="[1.0,1.1)",
- org.jboss.osgi.spi.util;version="[1.0,1.1)",
- org.junit;version="[4.6,5.0)",
- org.osgi.framework,
- org.osgi.util.tracker,
- org.slf4j;version="[1.5,1.6)",
-
- <!-- ignore client side -->
- !org.jboss.osgi.deployment.deployer,
- !org.jboss.osgi.spi.framework,
- !org.jboss.virtual,
- !org.osgi.framework.launch,
- !org.osgi.service.packageadmin,
- </Import-Package>
- <Private-Package>
- org.jboss.osgi.husky.internal,
- org.jboss.osgi.husky.runtime*,
- org.jboss.osgi.testing.internal,
- </Private-Package>
- <Embed-Transitive>true</Embed-Transitive>
- <Embed-Dependency>
- junit;inline=false,
- </Embed-Dependency>
- <_exportcontents>org.junit;version=${version.junit}</_exportcontents>
- </instructions>
- </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>
- </build>
-
-</project>
Copied: projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/harness/pom.xml (from rev 96813, projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/harness/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/harness/pom.xml 2009-11-24 11:47:11 UTC (rev 96814)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, JUnit testing for OSGi bundles -->
+ <!-- -->
+ <!-- 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 Bundles - Husky Implementation</name>
+
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-husky</artifactId>
+ <packaging>bundle</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-husky-parent</artifactId>
+ <version>1.0.2</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.runtime</groupId>
+ <artifactId>jboss-osgi-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-Activator>org.jboss.osgi.husky.runtime.osgi.HuskyActivator</Bundle-Activator>
+ <Export-Package>
+ org.jboss.osgi.husky;version=${version},
+ org.jboss.osgi.testing;version=${version},
+ </Export-Package>
+ <Import-Package>
+ javax.management,
+ javax.naming,
+ org.jboss.osgi.deployment.interceptor;version="[1.0,1.1)",
+ org.jboss.osgi.spi;version="[1.0,1.1)",
+ org.jboss.osgi.spi.capability;version="[1.0,1.1)",
+ org.jboss.osgi.spi.management;version="[1.0,1.1)",
+ org.jboss.osgi.spi.util;version="[1.0,1.1)",
+ org.junit;version="[4.6,5.0)",
+ org.osgi.framework,
+ org.osgi.util.tracker,
+ org.slf4j;version="[1.5,1.6)",
+
+ <!-- ignore client side -->
+ !org.jboss.osgi.deployment.deployer,
+ !org.jboss.osgi.spi.framework,
+ !org.jboss.virtual,
+ !org.osgi.framework.launch,
+ !org.osgi.service.packageadmin,
+ </Import-Package>
+ <Private-Package>
+ org.jboss.osgi.husky.internal,
+ org.jboss.osgi.husky.runtime*,
+ org.jboss.osgi.testing.internal,
+ </Private-Package>
+ <Embed-Transitive>true</Embed-Transitive>
+ <Embed-Dependency>
+ junit;inline=false,
+ </Embed-Dependency>
+ <_exportcontents>org.junit;version=${version.junit}</_exportcontents>
+ </instructions>
+ </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>
+ </build>
+
+</project>
Deleted: projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-11-24 11:35:51 UTC (rev 96811)
+++ projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/pom.xml 2009-11-24 11:47:11 UTC (rev 96814)
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, JUnit testing for OSGi bundles -->
- <!-- -->
- <!-- 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 Bundles - Husky</name>
- <description>JBoss OSGi Test Support</description>
-
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky-parent</artifactId>
- <packaging>pom</packaging>
-
- <version>1.0.2-SNAPSHOT</version>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4-SNAPSHOT</version>
- </parent>
-
- <!-- Subversion -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
- </scm>
-
- <!-- Properties -->
- <properties>
- <version.jboss.osgi.runtime.felix>2.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
- <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment>
- <version.osgi>4.2.0</version.osgi>
- </properties>
-
- <!-- Modules -->
- <modules>
- <module>harness</module>
- <module>testsuite</module>
- </modules>
-
- <!-- DependencyManagement -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-deployment</artifactId>
- <version>${version.jboss.osgi.deployment}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version.jboss.osgi.runtime.felix}</version>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-</project>
Copied: projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/pom.xml (from rev 96813, projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/pom.xml 2009-11-24 11:47:11 UTC (rev 96814)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, JUnit testing for OSGi bundles -->
+ <!-- -->
+ <!-- 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 Bundles - Husky</name>
+ <description>JBoss OSGi Test Support</description>
+
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-husky-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <version>1.0.2</version>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.4</version>
+ </parent>
+
+ <!-- Subversion -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
+ <url>http://fisheye.jboss.com/qsearch/JBossOSGi/tags/jboss-osgi-husky-parent-1...</url>
+ </scm>
+
+ <!-- Properties -->
+ <properties>
+ <version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix>
+ <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+ <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
+ <version.osgi>4.2.0</version.osgi>
+ </properties>
+
+ <!-- Modules -->
+ <modules>
+ <module>harness</module>
+ <module>testsuite</module>
+ </modules>
+
+ <!-- DependencyManagement -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.runtime</groupId>
+ <artifactId>jboss-osgi-deployment</artifactId>
+ <version>${version.jboss.osgi.deployment}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.osgi.runtime</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version.jboss.osgi.runtime.felix}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Deleted: projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-11-24 11:35:51 UTC (rev 96811)
+++ projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/testsuite/pom.xml 2009-11-24 11:47:11 UTC (rev 96814)
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, JUnit testing for OSGi bundles -->
- <!-- -->
- <!-- 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 Bundles - Husky Testsuite</name>
-
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky-testsuite</artifactId>
- <packaging>jar</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- </parent>
-
- <!-- Properties -->
- <properties>
- <surefire.jpda.args></surefire.jpda.args>
- </properties>
-
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>bundles</id>
- <phase>test-compile</phase>
- <goals>
- <goal>directory-single</goal>
- </goals>
- <configuration>
- <finalName>test-libs</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-bundles.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>build-test-jars</id>
- <phase>test-compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
- <property name="tests.output.dir" value="${project.build.directory}" />
- <ant antfile="scripts/antrun-test-jars.xml" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jpda.args}</argLine>
- <systemProperties>
- <property>
- <name>java.protocol.handler.pkgs</name>
- <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
- </property>
- <property>
- <name>log4j.output.dir</name>
- <value>${project.build.directory}</value>
- </property>
- <property>
- <name>org.jboss.osgi.husky.Invoker</name>
- <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
- </property>
- <property>
- <name>test.archive.directory</name>
- <value>${project.build.directory}/test-libs</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- Profiles -->
- <profiles>
-
- <!--
- Name: jpda
- Descr: Enable JPDA remote debuging
- -->
- <profile>
- <id>jpda</id>
- <activation>
- <property>
- <name>jpda</name>
- </property>
- </activation>
- <properties>
- <surefire.jpda.args>-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</surefire.jpda.args>
- </properties>
- </profile>
-
- </profiles>
-
-</project>
Copied: projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/testsuite/pom.xml (from rev 96813, projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/testsuite/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/bundles/husky/tags/jboss-osgi-husky-parent-1.0.2/testsuite/pom.xml 2009-11-24 11:47:11 UTC (rev 96814)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, JUnit testing for OSGi bundles -->
+ <!-- -->
+ <!-- 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 Bundles - Husky Testsuite</name>
+
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-husky-testsuite</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-husky-parent</artifactId>
+ <version>1.0.2</version>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+ <surefire.jpda.args />
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-husky</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.osgi.runtime</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundles</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>directory-single</goal>
+ </goals>
+ <configuration>
+ <finalName>test-libs</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-bundles.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-test-jars</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
+ <property name="tests.output.dir" value="${project.build.directory}" />
+ <ant antfile="scripts/antrun-test-jars.xml" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jpda.args}</argLine>
+ <systemProperties>
+ <property>
+ <name>java.protocol.handler.pkgs</name>
+ <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
+ </property>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</value>
+ </property>
+ <property>
+ <name>org.jboss.osgi.husky.Invoker</name>
+ <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+ </property>
+ <property>
+ <name>test.archive.directory</name>
+ <value>${project.build.directory}/test-libs</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Profiles -->
+ <profiles>
+
+ <!--
+ Name: jpda
+ Descr: Enable JPDA remote debuging
+ -->
+ <profile>
+ <id>jpda</id>
+ <activation>
+ <property>
+ <name>jpda</name>
+ </property>
+ </activation>
+ <properties>
+ <surefire.jpda.args>-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</surefire.jpda.args>
+ </properties>
+ </profile>
+
+ </profiles>
+
+</project>
14 years, 7 months
JBoss-OSGI SVN: r96813 - in projects/jboss-osgi/projects/bundles/husky/trunk: harness and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-24 06:46:41 -0500 (Tue, 24 Nov 2009)
New Revision: 96813
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml
Log:
[maven-release-plugin] prepare release jboss-osgi-husky-parent-1.0.2
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-11-24 11:38:35 UTC (rev 96812)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-11-24 11:46:41 UTC (rev 96813)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.2</version>
</parent>
<!-- Dependencies -->
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-11-24 11:38:35 UTC (rev 96812)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-11-24 11:46:41 UTC (rev 96813)
@@ -22,7 +22,7 @@
<artifactId>jboss-osgi-husky-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.2</version>
<!-- Parent -->
<parent>
@@ -33,14 +33,14 @@
<!-- Subversion -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
+ <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-husky-parent-1...</url>
</scm>
<!-- Properties -->
<properties>
- <version.jboss.osgi.runtime.felix>2.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
+ <version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
<version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
<version.osgi>4.2.0</version.osgi>
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-11-24 11:38:35 UTC (rev 96812)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-11-24 11:46:41 UTC (rev 96813)
@@ -25,12 +25,12 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.2</version>
</parent>
<!-- Properties -->
<properties>
- <surefire.jpda.args></surefire.jpda.args>
+ <surefire.jpda.args />
</properties>
<!-- Dependencies -->
14 years, 7 months
JBoss-OSGI SVN: r96812 - projects/jboss-osgi/projects/bundles/husky/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-24 06:38:35 -0500 (Tue, 24 Nov 2009)
New Revision: 96812
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
Log:
Update to stable versions
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-11-24 11:35:51 UTC (rev 96811)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-11-24 11:38:35 UTC (rev 96812)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.0.4</version>
</parent>
<!-- Subversion -->
@@ -41,8 +41,8 @@
<!-- Properties -->
<properties>
<version.jboss.osgi.runtime.felix>2.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
- <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment>
+ <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+ <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
<version.osgi>4.2.0</version.osgi>
</properties>
14 years, 7 months