[jboss-cvs] JBossAS SVN: r89051 - in projects/jboss-osgi/trunk: bundle/blueprint and 19 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 19 10:29:28 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-05-19 10:29:27 -0400 (Tue, 19 May 2009)
New Revision: 89051
Added:
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/AutoExportModes.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/ServicePropertyEntry.java
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicRootParserTestCase.java
projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/InitialContextFactory.java
Removed:
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TautoExportModes.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tinterfaces.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tservice.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TservicePropertyEntry.java
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/parser/ParserTestCase.java
projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/NamingService.java
projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/NamingServiceFactory.java
projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/NamingServiceImpl.java
Modified:
projects/jboss-osgi/trunk/bundle/blueprint/pom.xml
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/BeanMetadataImpl.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceProperties.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceReference.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/osgi/service/blueprint/reflect/ServiceMetadata.java
projects/jboss-osgi/trunk/bundle/blueprint/src/main/resources/schema/blueprint-jbxb.xsd
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/log4j.xml
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/parser/blueprint-basic-beans.xml
projects/jboss-osgi/trunk/bundle/jmx/pom.xml
projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/internal/ServiceActivator.java
projects/jboss-osgi/trunk/bundle/jndi/.classpath
projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/ServiceActivator.java
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java
projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java
projects/jboss-osgi/trunk/spi/pom.xml
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/bundle/ServiceActivator.java
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jndi/example-jndi.bnd
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/shop/sports/ClimbingStore.java
Log:
Initial integration with Husky
Modified: projects/jboss-osgi/trunk/bundle/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-05-19 14:29:27 UTC (rev 89051)
@@ -25,6 +25,11 @@
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ </dependency>
+
<!-- Provided Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
@@ -36,19 +41,94 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
-
+
<!-- Bundle Dependencies -->
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-husky-harness</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-logging</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jbossxb-bundle</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Build -->
<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-javadoc-plugin</artifactId>
<configuration>
<quiet>true</quiet>
@@ -62,6 +142,15 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- Exclude tests that require remote access -->
+ <exclude>**/junit4osgi/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/AutoExportModes.java (from rev 88856, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TautoExportModes.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/AutoExportModes.java (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/AutoExportModes.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -0,0 +1,64 @@
+/*
+ * 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.blueprint.reflect;
+
+// $Id$
+
+/**
+ * Java class for TautoExportModes.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 13-May-2009
+ */
+public enum AutoExportModes
+{
+
+ DISABLED("disabled"),
+ INTERFACES("interfaces"),
+ CLASS_HIERARCHY("class-hierarchy"),
+ ALL_CLASSES("all-classes");
+
+ private final String value;
+
+ AutoExportModes(String v)
+ {
+ value = v;
+ }
+
+ public String value()
+ {
+ return value;
+ }
+
+ public static AutoExportModes fromValue(String v)
+ {
+ for (AutoExportModes c : AutoExportModes.values())
+ {
+ if (c.value.equals(v))
+ {
+ return c;
+ }
+ }
+ throw new IllegalArgumentException(v);
+ }
+
+}
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/BeanMetadataImpl.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/BeanMetadataImpl.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/BeanMetadataImpl.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -282,6 +282,10 @@
{
return otherAttributes;
}
+
+
+ // **********************************************************************
+
public List getArguments()
{
Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java (from rev 88857, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tservice.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -0,0 +1,354 @@
+/*
+ * 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.blueprint.reflect;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.xml.namespace.QName;
+
+import org.jboss.osgi.spi.NotImplementedException;
+import org.osgi.service.blueprint.reflect.ServiceMetadata;
+import org.osgi.service.blueprint.reflect.Target;
+import org.w3c.dom.Element;
+
+/**
+ * Tservice is the type for services exported by this blueprint bundle. Services are sourced by either a <ref> to a <bean> component or an <inline> bean component.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 13-May-2009
+ */
+public class ServiceMetadataImpl extends ComponentMetadataImpl implements ServiceMetadata
+{
+ protected String description;
+ protected List<String> interfaces;
+ protected List<ServicePropertyEntry> serviceProperties;
+ protected List<TregistrationListener> registrationListener;
+ protected BeanMetadataImpl bean;
+ protected Tref refFIXME;
+ protected List<Object> any;
+ protected String _interface;
+ protected String ref;
+ protected String dependsOn;
+ protected AutoExportModes autoExport;
+ protected int ranking;
+ private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+ /**
+ * Gets the value of the description property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getDescription()
+ {
+ return description;
+ }
+
+ /**
+ * Sets the value of the description property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setDescription(String value)
+ {
+ this.description = value;
+ }
+
+ /**
+ * Gets the value of the interfaces property.
+ */
+ public List<String> getInterfaceNames()
+ {
+ if (interfaces == null)
+ interfaces = new ArrayList<String>();
+
+ return interfaces;
+ }
+
+ /**
+ * Gets the value of the serviceProperties property.
+ */
+ public List<ServicePropertyEntry> getServiceProperties()
+ {
+ if (serviceProperties == null)
+ serviceProperties = new ArrayList<ServicePropertyEntry>();
+
+ return serviceProperties;
+ }
+
+ /**
+ * Gets the value of the registrationListener property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the
+ * JAXB object. This is why there is not a <CODE>set</CODE> method for the registrationListener property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ *
+ * <pre>
+ * getRegistrationListener().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list {@link TregistrationListener }
+ *
+ *
+ */
+ public List<TregistrationListener> getRegistrationListener()
+ {
+ if (registrationListener == null)
+ {
+ registrationListener = new ArrayList<TregistrationListener>();
+ }
+ return this.registrationListener;
+ }
+
+ /**
+ * Gets the value of the bean property.
+ *
+ * @return possible object is {@link BeanMetadataImpl }
+ *
+ */
+ public BeanMetadataImpl getBean()
+ {
+ return bean;
+ }
+
+ /**
+ * Sets the value of the bean property.
+ *
+ * @param value allowed object is {@link BeanMetadataImpl }
+ *
+ */
+ public void setBean(BeanMetadataImpl value)
+ {
+ this.bean = value;
+ }
+
+ /**
+ * Gets the value of the refFIXME property.
+ *
+ * @return possible object is {@link Tref }
+ *
+ */
+ public Tref getRefFIXME()
+ {
+ return refFIXME;
+ }
+
+ /**
+ * Sets the value of the refFIXME property.
+ *
+ * @param value allowed object is {@link Tref }
+ *
+ */
+ public void setRefFIXME(Tref value)
+ {
+ this.refFIXME = value;
+ }
+
+ /**
+ * Gets the value of the any property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the
+ * JAXB object. This is why there is not a <CODE>set</CODE> method for the any property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ *
+ * <pre>
+ * getAny().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list {@link Object } {@link Element }
+ *
+ *
+ */
+ public List<Object> getAny()
+ {
+ if (any == null)
+ {
+ any = new ArrayList<Object>();
+ }
+ return this.any;
+ }
+
+ /**
+ * Gets the value of the interface property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getInterface()
+ {
+ return _interface;
+ }
+
+ /**
+ * Sets the value of the interface property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setInterface(String value)
+ {
+ this._interface = value;
+ }
+
+ /**
+ * Gets the value of the ref property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getRef()
+ {
+ return ref;
+ }
+
+ /**
+ * Sets the value of the ref property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setRef(String value)
+ {
+ this.ref = value;
+ }
+
+ /**
+ * Gets the value of the dependsOn property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getDependsOn()
+ {
+ return dependsOn;
+ }
+
+ /**
+ * Sets the value of the dependsOn property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setDependsOn(String value)
+ {
+ this.dependsOn = value;
+ }
+
+ /**
+ * Gets the value of the autoExport property.
+ *
+ * @return possible object is {@link AutoExportModes }
+ *
+ */
+ public AutoExportModes getAutoExport()
+ {
+ if (autoExport == null)
+ {
+ return AutoExportModes.DISABLED;
+ }
+ else
+ {
+ return autoExport;
+ }
+ }
+
+ /**
+ * Sets the value of the autoExport property.
+ *
+ * @param value allowed object is {@link AutoExportModes }
+ *
+ */
+ public void setAutoExport(AutoExportModes value)
+ {
+ this.autoExport = value;
+ }
+
+ /**
+ * Gets the value of the ranking property.
+ */
+ public int getRanking()
+ {
+ return ranking;
+ }
+
+ /**
+ * Sets the value of the ranking property.
+ */
+ public void setRanking(int value)
+ {
+ this.ranking = value;
+ }
+
+ /**
+ * Gets a map that contains attributes that aren't bound to any typed property on this class.
+ *
+ * <p>
+ * the map is keyed by the name of the attribute and the value is the string value of the attribute.
+ *
+ * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter.
+ *
+ *
+ * @return always non-null
+ */
+ public Map<QName, String> getOtherAttributes()
+ {
+ return otherAttributes;
+ }
+
+ // **********************************************************************
+
+ public int getAutoExportMode()
+ {
+ throw new NotImplementedException();
+ }
+
+ public List getExplicitDependencies()
+ {
+ throw new NotImplementedException();
+ }
+
+ public Collection getRegistrationListeners()
+ {
+ throw new NotImplementedException();
+ }
+
+ public Target getServiceComponent()
+ {
+ throw new NotImplementedException();
+ }
+}
Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/ServicePropertyEntry.java (from rev 88857, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TservicePropertyEntry.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/ServicePropertyEntry.java (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/ServicePropertyEntry.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -0,0 +1,40 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.05.13 at 02:16:52 PM CEST
+//
+
+package org.jboss.osgi.blueprint.reflect;
+
+/**
+ * TservicePropertyEntry is an entry value used for the <service-properties> element. This does not allow a child <key> element and there are no key-ref or value-ref
+ * attributes.
+ *
+ */
+public class ServicePropertyEntry
+{
+ protected String key;
+ protected String value;
+
+ public String getKey()
+ {
+ return key;
+ }
+
+ public void setKey(String key)
+ {
+ this.key = key;
+ }
+
+ public String getValue()
+ {
+ return value;
+ }
+
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
+
+}
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -59,7 +59,7 @@
public class Targument {
protected String description;
- protected Tservice service;
+ protected ServiceMetadataImpl service;
protected TrefCollection refList;
protected TrefCollection refSet;
protected BeanMetadataImpl bean;
@@ -108,10 +108,10 @@
*
* @return
* possible object is
- * {@link Tservice }
+ * {@link ServiceMetadataImpl }
*
*/
- public Tservice getService() {
+ public ServiceMetadataImpl getService() {
return service;
}
@@ -120,10 +120,10 @@
*
* @param value
* allowed object is
- * {@link Tservice }
+ * {@link ServiceMetadataImpl }
*
*/
- public void setService(Tservice value) {
+ public void setService(ServiceMetadataImpl value) {
this.service = value;
}
Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TautoExportModes.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TautoExportModes.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TautoExportModes.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -1,54 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2009.05.13 at 02:16:52 PM CEST
-//
-
-
-package org.jboss.osgi.blueprint.reflect;
-
-
-/**
- * <p>Java class for TautoExportModes.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * <simpleType name="TautoExportModes">
- * <restriction base="{http://www.w3.org/2001/XMLSchema}token">
- * <enumeration value="disabled"/>
- * <enumeration value="interfaces"/>
- * <enumeration value="class-hierarchy"/>
- * <enumeration value="all-classes"/>
- * </restriction>
- * </simpleType>
- * </pre>
- *
- */
-public enum TautoExportModes {
-
- DISABLED("disabled"),
- INTERFACES("interfaces"),
- CLASS_HIERARCHY("class-hierarchy"),
- ALL_CLASSES("all-classes");
- private final String value;
-
- TautoExportModes(String v) {
- value = v;
- }
-
- public String value() {
- return value;
- }
-
- public static TautoExportModes fromValue(String v) {
- for (TautoExportModes c: TautoExportModes.values()) {
- if (c.value.equals(v)) {
- return c;
- }
- }
- throw new IllegalArgumentException(v);
- }
-
-}
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -60,7 +60,7 @@
* <p>
* Objects of the following type(s) are allowed in the list
* {@link JAXBElement }{@code <}{@link Tvalue }{@code >}
- * {@link JAXBElement }{@code <}{@link Tservice }{@code >}
+ * {@link JAXBElement }{@code <}{@link ServiceMetadataImpl }{@code >}
* {@link JAXBElement }{@code <}{@link Tref }{@code >}
* {@link JAXBElement }{@code <}{@link Treference }{@code >}
* {@link JAXBElement }{@code <}{@link Tref }{@code >}
Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tinterfaces.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tinterfaces.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tinterfaces.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -1,74 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2009.05.13 at 02:16:52 PM CEST
-//
-
-
-package org.jboss.osgi.blueprint.reflect;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- *
- *
- * The type definition for the <interfaces> element used for <service>,
- * <reference>, <ref-set>, and <ref-list>;
- *
- *
- *
- * <p>Java class for Tinterfaces complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="Tinterfaces">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <choice maxOccurs="unbounded">
- * <element name="value" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TinterfaceValue"/>
- * </choice>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-public class Tinterfaces {
-
- protected List<String> value;
-
- /**
- * Gets the value of the value property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the value property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getValue().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link String }
- *
- *
- */
- public List<String> getValue() {
- if (value == null) {
- value = new ArrayList<String>();
- }
- return this.value;
- }
-
-}
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -39,7 +39,7 @@
*/
public class Tkey {
- protected Tservice service;
+ protected ServiceMetadataImpl service;
protected TrefCollection refList;
protected TrefCollection refSet;
protected BeanMetadataImpl bean;
@@ -59,10 +59,10 @@
*
* @return
* possible object is
- * {@link Tservice }
+ * {@link ServiceMetadataImpl }
*
*/
- public Tservice getService() {
+ public ServiceMetadataImpl getService() {
return service;
}
@@ -71,10 +71,10 @@
*
* @param value
* allowed object is
- * {@link Tservice }
+ * {@link ServiceMetadataImpl }
*
*/
- public void setService(Tservice value) {
+ public void setService(ServiceMetadataImpl value) {
this.service = value;
}
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -50,7 +50,7 @@
public class TmapEntry {
protected Tkey keyFIXME;
- protected Tservice service;
+ protected ServiceMetadataImpl service;
protected TrefCollection refList;
protected TrefCollection refSet;
protected BeanMetadataImpl bean;
@@ -99,10 +99,10 @@
*
* @return
* possible object is
- * {@link Tservice }
+ * {@link ServiceMetadataImpl }
*
*/
- public Tservice getService() {
+ public ServiceMetadataImpl getService() {
return service;
}
@@ -111,10 +111,10 @@
*
* @param value
* allowed object is
- * {@link Tservice }
+ * {@link ServiceMetadataImpl }
*
*/
- public void setService(Tservice value) {
+ public void setService(ServiceMetadataImpl value) {
this.service = value;
}
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -51,7 +51,7 @@
public class Tproperty {
protected String description;
- protected Tservice service;
+ protected ServiceMetadataImpl service;
protected TrefCollection refList;
protected TrefCollection refSet;
protected BeanMetadataImpl bean;
@@ -99,10 +99,10 @@
*
* @return
* possible object is
- * {@link Tservice }
+ * {@link ServiceMetadataImpl }
*
*/
- public Tservice getService() {
+ public ServiceMetadataImpl getService() {
return service;
}
@@ -111,10 +111,10 @@
*
* @param value
* allowed object is
- * {@link Tservice }
+ * {@link ServiceMetadataImpl }
*
*/
- public void setService(Tservice value) {
+ public void setService(ServiceMetadataImpl value) {
this.service = value;
}
Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tservice.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tservice.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tservice.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -1,396 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2009.05.13 at 02:16:52 PM CEST
-//
-
-
-package org.jboss.osgi.blueprint.reflect;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- *
- *
- * Tservice is the type for services exported by this blueprint bundle.
- * Services are sourced by either a <ref> to a <bean> component or an
- * <inline> bean component.
- *
- *
- *
- * <p>Java class for Tservice complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="Tservice">
- * <complexContent>
- * <extension base="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tcomponent">
- * <sequence>
- * <group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}serviceElements"/>
- * <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <attribute name="interface" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tclass" />
- * <attribute name="ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
- * <attribute name="depends-on" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TdependsOn" />
- * <attribute name="auto-export" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TautoExportModes" default="disabled" />
- * <attribute name="ranking" type="{http://www.w3.org/2001/XMLSchema}int" default="0" />
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-public class Tservice
- extends ComponentMetadataImpl
-{
-
- protected String description;
- protected Tinterfaces interfaces;
- protected TserviceProperties serviceProperties;
- protected List<TregistrationListener> registrationListener;
- protected BeanMetadataImpl bean;
- protected Tref refFIXME;
- protected List<Object> any;
- protected String _interface;
- protected String ref;
- protected String dependsOn;
- protected TautoExportModes autoExport;
- protected Integer ranking;
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
- /**
- * Gets the value of the description property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Sets the value of the description property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDescription(String value) {
- this.description = value;
- }
-
- /**
- * Gets the value of the interfaces property.
- *
- * @return
- * possible object is
- * {@link Tinterfaces }
- *
- */
- public Tinterfaces getInterfaces() {
- return interfaces;
- }
-
- /**
- * Sets the value of the interfaces property.
- *
- * @param value
- * allowed object is
- * {@link Tinterfaces }
- *
- */
- public void setInterfaces(Tinterfaces value) {
- this.interfaces = value;
- }
-
- /**
- * Gets the value of the serviceProperties property.
- *
- * @return
- * possible object is
- * {@link TserviceProperties }
- *
- */
- public TserviceProperties getServiceProperties() {
- return serviceProperties;
- }
-
- /**
- * Sets the value of the serviceProperties property.
- *
- * @param value
- * allowed object is
- * {@link TserviceProperties }
- *
- */
- public void setServiceProperties(TserviceProperties value) {
- this.serviceProperties = value;
- }
-
- /**
- * Gets the value of the registrationListener property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the registrationListener property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getRegistrationListener().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link TregistrationListener }
- *
- *
- */
- public List<TregistrationListener> getRegistrationListener() {
- if (registrationListener == null) {
- registrationListener = new ArrayList<TregistrationListener>();
- }
- return this.registrationListener;
- }
-
- /**
- * Gets the value of the bean property.
- *
- * @return
- * possible object is
- * {@link BeanMetadataImpl }
- *
- */
- public BeanMetadataImpl getBean() {
- return bean;
- }
-
- /**
- * Sets the value of the bean property.
- *
- * @param value
- * allowed object is
- * {@link BeanMetadataImpl }
- *
- */
- public void setBean(BeanMetadataImpl value) {
- this.bean = value;
- }
-
- /**
- * Gets the value of the refFIXME property.
- *
- * @return
- * possible object is
- * {@link Tref }
- *
- */
- public Tref getRefFIXME() {
- return refFIXME;
- }
-
- /**
- * Sets the value of the refFIXME property.
- *
- * @param value
- * allowed object is
- * {@link Tref }
- *
- */
- public void setRefFIXME(Tref value) {
- this.refFIXME = value;
- }
-
- /**
- * Gets the value of the any property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the any property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAny().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link Element }
- *
- *
- */
- public List<Object> getAny() {
- if (any == null) {
- any = new ArrayList<Object>();
- }
- return this.any;
- }
-
- /**
- * Gets the value of the interface property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInterface() {
- return _interface;
- }
-
- /**
- * Sets the value of the interface property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInterface(String value) {
- this._interface = value;
- }
-
- /**
- * Gets the value of the ref property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getRef() {
- return ref;
- }
-
- /**
- * Sets the value of the ref property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setRef(String value) {
- this.ref = value;
- }
-
- /**
- * Gets the value of the dependsOn property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDependsOn() {
- return dependsOn;
- }
-
- /**
- * Sets the value of the dependsOn property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDependsOn(String value) {
- this.dependsOn = value;
- }
-
- /**
- * Gets the value of the autoExport property.
- *
- * @return
- * possible object is
- * {@link TautoExportModes }
- *
- */
- public TautoExportModes getAutoExport() {
- if (autoExport == null) {
- return TautoExportModes.DISABLED;
- } else {
- return autoExport;
- }
- }
-
- /**
- * Sets the value of the autoExport property.
- *
- * @param value
- * allowed object is
- * {@link TautoExportModes }
- *
- */
- public void setAutoExport(TautoExportModes value) {
- this.autoExport = value;
- }
-
- /**
- * Gets the value of the ranking property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public int getRanking() {
- if (ranking == null) {
- return 0;
- } else {
- return ranking;
- }
- }
-
- /**
- * Sets the value of the ranking property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setRanking(Integer value) {
- this.ranking = value;
- }
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- *
- * <p>
- * the map is keyed by the name of the attribute and
- * the value is the string value of the attribute.
- *
- * the map returned by this method is live, and you can add new attribute
- * by updating the map directly. Because of this design, there's no setter.
- *
- *
- * @return
- * always non-null
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-
-}
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceProperties.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceProperties.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceProperties.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -41,7 +41,7 @@
*/
public class TserviceProperties {
- protected List<TservicePropertyEntry> entry;
+ protected List<ServicePropertyEntry> entry;
/**
* Gets the value of the entry property.
@@ -61,13 +61,13 @@
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link TservicePropertyEntry }
+ * {@link ServicePropertyEntry }
*
*
*/
- public List<TservicePropertyEntry> getEntry() {
+ public List<ServicePropertyEntry> getEntry() {
if (entry == null) {
- entry = new ArrayList<TservicePropertyEntry>();
+ entry = new ArrayList<ServicePropertyEntry>();
}
return this.entry;
}
Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TservicePropertyEntry.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TservicePropertyEntry.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TservicePropertyEntry.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -1,476 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2009.05.13 at 02:16:52 PM CEST
-//
-
-
-package org.jboss.osgi.blueprint.reflect;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- *
- * TservicePropertyEntry is an entry value used for the <service-properties>
- * element. This does not allow a child <key> element and there are no
- * key-ref or value-ref attributes.
- *
- *
- *
- * <p>Java class for TservicePropertyEntry complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="TservicePropertyEntry">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}value"/>
- * </sequence>
- * <attribute name="key" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
- * <attribute name="valueFIXME" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-public class TservicePropertyEntry {
-
- protected Tservice service;
- protected TrefCollection refList;
- protected TrefCollection refSet;
- protected BeanMetadataImpl bean;
- protected Treference reference;
- protected Tref refFIXME;
- protected List<Object> any;
- protected Tref idref;
- protected Tvalue value;
- protected Tcollection list;
- protected Tcollection set;
- protected Tmap map;
- protected Tcollection array;
- protected Tprops props;
- protected Tnull _null;
- protected String key;
- protected String valueFIXME;
-
- /**
- * Gets the value of the service property.
- *
- * @return
- * possible object is
- * {@link Tservice }
- *
- */
- public Tservice getService() {
- return service;
- }
-
- /**
- * Sets the value of the service property.
- *
- * @param value
- * allowed object is
- * {@link Tservice }
- *
- */
- public void setService(Tservice value) {
- this.service = value;
- }
-
- /**
- * Gets the value of the refList property.
- *
- * @return
- * possible object is
- * {@link TrefCollection }
- *
- */
- public TrefCollection getRefList() {
- return refList;
- }
-
- /**
- * Sets the value of the refList property.
- *
- * @param value
- * allowed object is
- * {@link TrefCollection }
- *
- */
- public void setRefList(TrefCollection value) {
- this.refList = value;
- }
-
- /**
- * Gets the value of the refSet property.
- *
- * @return
- * possible object is
- * {@link TrefCollection }
- *
- */
- public TrefCollection getRefSet() {
- return refSet;
- }
-
- /**
- * Sets the value of the refSet property.
- *
- * @param value
- * allowed object is
- * {@link TrefCollection }
- *
- */
- public void setRefSet(TrefCollection value) {
- this.refSet = value;
- }
-
- /**
- * Gets the value of the bean property.
- *
- * @return
- * possible object is
- * {@link BeanMetadataImpl }
- *
- */
- public BeanMetadataImpl getBean() {
- return bean;
- }
-
- /**
- * Sets the value of the bean property.
- *
- * @param value
- * allowed object is
- * {@link BeanMetadataImpl }
- *
- */
- public void setBean(BeanMetadataImpl value) {
- this.bean = value;
- }
-
- /**
- * Gets the value of the reference property.
- *
- * @return
- * possible object is
- * {@link Treference }
- *
- */
- public Treference getReference() {
- return reference;
- }
-
- /**
- * Sets the value of the reference property.
- *
- * @param value
- * allowed object is
- * {@link Treference }
- *
- */
- public void setReference(Treference value) {
- this.reference = value;
- }
-
- /**
- * Gets the value of the refFIXME property.
- *
- * @return
- * possible object is
- * {@link Tref }
- *
- */
- public Tref getRefFIXME() {
- return refFIXME;
- }
-
- /**
- * Sets the value of the refFIXME property.
- *
- * @param value
- * allowed object is
- * {@link Tref }
- *
- */
- public void setRefFIXME(Tref value) {
- this.refFIXME = value;
- }
-
- /**
- * Gets the value of the any property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the any property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAny().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Object }
- *
- *
- */
- public List<Object> getAny() {
- if (any == null) {
- any = new ArrayList<Object>();
- }
- return this.any;
- }
-
- /**
- * Gets the value of the idref property.
- *
- * @return
- * possible object is
- * {@link Tref }
- *
- */
- public Tref getIdref() {
- return idref;
- }
-
- /**
- * Sets the value of the idref property.
- *
- * @param value
- * allowed object is
- * {@link Tref }
- *
- */
- public void setIdref(Tref value) {
- this.idref = value;
- }
-
- /**
- * Gets the value of the value property.
- *
- * @return
- * possible object is
- * {@link Tvalue }
- *
- */
- public Tvalue getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
- *
- * @param value
- * allowed object is
- * {@link Tvalue }
- *
- */
- public void setValue(Tvalue value) {
- this.value = value;
- }
-
- /**
- * Gets the value of the list property.
- *
- * @return
- * possible object is
- * {@link Tcollection }
- *
- */
- public Tcollection getList() {
- return list;
- }
-
- /**
- * Sets the value of the list property.
- *
- * @param value
- * allowed object is
- * {@link Tcollection }
- *
- */
- public void setList(Tcollection value) {
- this.list = value;
- }
-
- /**
- * Gets the value of the set property.
- *
- * @return
- * possible object is
- * {@link Tcollection }
- *
- */
- public Tcollection getSet() {
- return set;
- }
-
- /**
- * Sets the value of the set property.
- *
- * @param value
- * allowed object is
- * {@link Tcollection }
- *
- */
- public void setSet(Tcollection value) {
- this.set = value;
- }
-
- /**
- * Gets the value of the map property.
- *
- * @return
- * possible object is
- * {@link Tmap }
- *
- */
- public Tmap getMap() {
- return map;
- }
-
- /**
- * Sets the value of the map property.
- *
- * @param value
- * allowed object is
- * {@link Tmap }
- *
- */
- public void setMap(Tmap value) {
- this.map = value;
- }
-
- /**
- * Gets the value of the array property.
- *
- * @return
- * possible object is
- * {@link Tcollection }
- *
- */
- public Tcollection getArray() {
- return array;
- }
-
- /**
- * Sets the value of the array property.
- *
- * @param value
- * allowed object is
- * {@link Tcollection }
- *
- */
- public void setArray(Tcollection value) {
- this.array = value;
- }
-
- /**
- * Gets the value of the props property.
- *
- * @return
- * possible object is
- * {@link Tprops }
- *
- */
- public Tprops getProps() {
- return props;
- }
-
- /**
- * Sets the value of the props property.
- *
- * @param value
- * allowed object is
- * {@link Tprops }
- *
- */
- public void setProps(Tprops value) {
- this.props = value;
- }
-
- /**
- * Gets the value of the null property.
- *
- * @return
- * possible object is
- * {@link Tnull }
- *
- */
- public Tnull getNull() {
- return _null;
- }
-
- /**
- * Sets the value of the null property.
- *
- * @param value
- * allowed object is
- * {@link Tnull }
- *
- */
- public void setNull(Tnull value) {
- this._null = value;
- }
-
- /**
- * Gets the value of the key property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Sets the value of the key property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setKey(String value) {
- this.key = value;
- }
-
- /**
- * Gets the value of the valueFIXME property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getValueFIXME() {
- return valueFIXME;
- }
-
- /**
- * Sets the value of the valueFIXME property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setValueFIXME(String value) {
- this.valueFIXME = value;
- }
-
-}
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceReference.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceReference.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceReference.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -56,7 +56,7 @@
{
protected String description;
- protected Tinterfaces interfaces;
+ protected List<String> interfaces;
protected List<TReferenceListener> listener;
protected List<Object> any;
protected String _interface;
@@ -90,26 +90,16 @@
/**
* Gets the value of the interfaces property.
*
- * @return possible object is {@link Tinterfaces }
- *
*/
- public Tinterfaces getInterfaces()
+ public List<String> getInterfaceNames()
{
+ if (interfaces == null)
+ interfaces = new ArrayList<String>();
+
return interfaces;
}
/**
- * Sets the value of the interfaces property.
- *
- * @param value allowed object is {@link Tinterfaces }
- *
- */
- public void setInterfaces(Tinterfaces value)
- {
- this.interfaces = value;
- }
-
- /**
* Gets the value of the listener property.
*
* <p>
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/osgi/service/blueprint/reflect/ServiceMetadata.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/osgi/service/blueprint/reflect/ServiceMetadata.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/osgi/service/blueprint/reflect/ServiceMetadata.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -66,7 +66,7 @@
*
* @return an immutable set of (String) type names, or an empty set if using auto-export
*/
- List/*<String>*/ getInterfaceNames();
+ List<String> getInterfaceNames();
/**
* Return the auto-export mode specified.
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/resources/schema/blueprint-jbxb.xsd
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/resources/schema/blueprint-jbxb.xsd 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/resources/schema/blueprint-jbxb.xsd 2009-05-19 14:29:27 UTC (rev 89051)
@@ -226,9 +226,27 @@
</xsd:documentation>
</xsd:annotation>
<xsd:choice>
- <xsd:element name="service" type="Tservice" />
- <xsd:element name="ref-list" type="Tref-collection" />
- <xsd:element name="ref-set" type="Tref-collection" />
+ <xsd:element name="service" type="Tservice" >
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:property name="components"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="ref-list" type="Tref-collection" >
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:property name="components"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="ref-set" type="Tref-collection" >
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:property name="components"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ </xsd:element>
<xsd:group ref="targetComponent" />
</xsd:choice>
</xsd:group>
@@ -635,6 +653,9 @@
<xsd:complexType name="Tservice">
<xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.osgi.blueprint.reflect.ServiceMetadataImpl"></jbxb:class>
+ </xsd:appinfo>
<xsd:documentation>
<![CDATA[
Tservice is the type for services exported by this blueprint bundle.
@@ -650,7 +671,13 @@
<xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
processContents="lax" />
</xsd:sequence>
- <xsd:attribute name="interface" type="Tclass" use="optional" />
+ <xsd:attribute name="interface" type="Tclass" use="optional" >
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:property name="interfaceNames"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute name="ref" type="Tidref" use="optional" />
<xsd:attribute name="depends-on" type="TdependsOn" use="optional">
<xsd:annotation>
@@ -1027,7 +1054,13 @@
</xsd:documentation>
</xsd:annotation>
<xsd:choice minOccurs="1" maxOccurs="unbounded">
- <xsd:element name="value" type="TinterfaceValue" />
+ <xsd:element name="value" type="TinterfaceValue" >
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:property name="interfaceNames"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ </xsd:element>
</xsd:choice>
</xsd:complexType>
@@ -1111,6 +1144,9 @@
<xsd:simpleType name="TautoExportModes">
<xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.osgi.blueprint.reflect.AutoExportModes"></jbxb:class>
+ </xsd:appinfo>
<xsd:documentation>
<![CDATA[
TautoExportModes is a base type that should be used for export-mode
Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicRootParserTestCase.java (from rev 88857, projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/parser/ParserTestCase.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicRootParserTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicRootParserTestCase.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -0,0 +1,63 @@
+/*
+ * 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.test.osgi.blueprint.parser;
+
+//$Id$
+
+import java.math.BigInteger;
+import java.net.URL;
+
+import org.jboss.osgi.blueprint.parser.BlueprintParser;
+import org.jboss.osgi.blueprint.reflect.Availability;
+import org.jboss.osgi.blueprint.reflect.Blueprint;
+import org.jboss.osgi.spi.testing.OSGiTest;
+
+/**
+ * Blueprint parser tests
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 13-May-2009
+ */
+public class BasicRootParserTestCase extends OSGiTest
+{
+ public void testBlueprintDefaultAttributes() throws Exception
+ {
+ URL xmlURL = getResourceURL("parser/blueprint-basic-root.xml");
+ Blueprint blueprint = new BlueprintParser().parse(xmlURL);
+
+ // assert default attributes
+ assertEquals(Availability.MANDATORY, blueprint.getDefaultAvailability());
+ assertEquals(new BigInteger("300000"), blueprint.getDefaultTimeout());
+ assertEquals(Boolean.FALSE, blueprint.isDefaultLazyInit());
+ assertNull(blueprint.getDefaultInitMethod());
+ assertNull(blueprint.getDefaultDestroyMethod());
+ }
+
+ public void testBlueprintDescription() throws Exception
+ {
+ URL xmlURL = getResourceURL("parser/blueprint-basic-root.xml");
+ Blueprint blueprint = new BlueprintParser().parse(xmlURL);
+
+ // assert description
+ assertEquals("some text", blueprint.getDescription());
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/parser/ParserTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/parser/ParserTestCase.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/parser/ParserTestCase.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -1,83 +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.test.osgi.blueprint.parser;
-
-//$Id$
-
-import java.math.BigInteger;
-import java.net.URL;
-import java.util.List;
-
-import org.jboss.osgi.blueprint.parser.BlueprintParser;
-import org.jboss.osgi.blueprint.reflect.Availability;
-import org.jboss.osgi.blueprint.reflect.Blueprint;
-import org.jboss.osgi.blueprint.reflect.ComponentMetadataImpl;
-import org.jboss.osgi.spi.testing.OSGiTest;
-import org.osgi.service.blueprint.reflect.BeanMetadata;
-
-/**
- * Blueprint parser tests
- *
- * @author thomas.diesler at jboss.com
- * @since 13-May-2009
- */
-public class ParserTestCase extends OSGiTest
-{
- public void _testBlueprintDefaultAttributes() throws Exception
- {
- URL xmlURL = getResourceURL("parser/blueprint-basic-root.xml");
- Blueprint blueprint = new BlueprintParser().parse(xmlURL);
-
- // assert default attributes
- assertEquals(Availability.MANDATORY, blueprint.getDefaultAvailability());
- assertEquals(new BigInteger("300000"), blueprint.getDefaultTimeout());
- assertEquals(Boolean.FALSE, blueprint.isDefaultLazyInit());
- assertNull(blueprint.getDefaultInitMethod());
- assertNull(blueprint.getDefaultDestroyMethod());
- }
-
- public void _testBlueprintDescription() throws Exception
- {
- URL xmlURL = getResourceURL("parser/blueprint-basic-root.xml");
- Blueprint blueprint = new BlueprintParser().parse(xmlURL);
-
- // assert description
- assertEquals("some text", blueprint.getDescription());
- }
-
- public void testBasicBeans() throws Exception
- {
- URL xmlURL = getResourceURL("parser/blueprint-basic-beans.xml");
- Blueprint blueprint = new BlueprintParser().parse(xmlURL);
-
- List<ComponentMetadataImpl> compList = blueprint.getComponents();
- assertTrue(compList.size() > 0);
-
- BeanMetadata beanA = (BeanMetadata)compList.get(0);
- assertEquals(BeanA.class.getName(), beanA.getClassName());
- assertEquals("A", beanA.getId());
-
- BeanMetadata beanB = (BeanMetadata)compList.get(1);
- assertEquals(BeanB.class.getName(), beanB.getClassName());
- assertEquals("B", beanB.getId());
- }
-}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/log4j.xml 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/log4j.xml 2009-05-19 14:29:27 UTC (rev 89051)
@@ -38,10 +38,11 @@
</category>
-->
- <!-- Show jboss deployer traces -->
+ <!-- Show jboss deployer traces
<category name="org.jboss.xb">
<priority value="TRACE" />
</category>
+ -->
<!-- ======================= -->
<!-- Setup the Root category -->
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/parser/blueprint-basic-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/parser/blueprint-basic-beans.xml 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/parser/blueprint-basic-beans.xml 2009-05-19 14:29:27 UTC (rev 89051)
@@ -1,11 +1,11 @@
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd schema/blueprint.xsd">
- <bean id="A" class="org.jboss.test.osgi.blueprint.parser.BeanA">
+ <bean id="beanA" class="org.jboss.test.osgi.blueprint.parser.BeanA">
</bean>
- <bean id="B" class="org.jboss.test.osgi.blueprint.parser.BeanB">
- <property name="beanA" ref="A"/>
+ <bean id="beanB" class="org.jboss.test.osgi.blueprint.parser.BeanB">
+ <property name="beanA" ref="beanA"/>
</bean>
</blueprint>
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/bundle/jmx/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/jmx/pom.xml 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/jmx/pom.xml 2009-05-19 14:29:27 UTC (rev 89051)
@@ -61,16 +61,24 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.jboss.osgi.jmx.internal.ServiceActivator</Bundle-Activator>
<Import-Package>
+
+ <!-- system -->
javax.management*,
javax.naming,
- javax.naming.spi,
- org.jboss.net.sockets,
- org.jboss.osgi.common.log,
- org.jboss.osgi.jndi,
- org.jnp.interfaces,
+ javax.naming.spi,
+
+ <!-- jboss-osgi -->
+ org.jboss.osgi.common.log,
+
+ <!-- osgi -->
org.osgi.framework;version=1.4,
org.osgi.service.log,
org.osgi.util.tracker,
+
+ <!-- optional -->
+ org.jboss.osgi.jndi;resolution:=optional,
+ org.jboss.net.sockets;resolution:=optional,
+ org.jnp.interfaces;resolution:=optional,
</Import-Package>
</instructions>
</configuration>
Modified: projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/internal/ServiceActivator.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/internal/ServiceActivator.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/internal/ServiceActivator.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -32,7 +32,6 @@
import javax.naming.StringRefAddr;
import org.jboss.osgi.common.log.LogServiceTracker;
-import org.jboss.osgi.jndi.NamingService;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -103,14 +102,14 @@
public NamingServiceTracker(BundleContext context, String rmiAdaptorPath)
{
- super(context, NamingService.class.getName(), null);
+ super(context, InitialContext.class.getName(), null);
this.rmiAdaptorPath = rmiAdaptorPath;
}
@Override
public Object addingService(ServiceReference reference)
{
- NamingService naming = (NamingService)super.addingService(reference);
+ InitialContext iniCtx = (InitialContext)super.addingService(reference);
// Start JMXConnectorService
if (jmxConnector == null)
@@ -122,7 +121,6 @@
// Bind the RMIAdaptor
try
{
- InitialContext iniCtx = naming.getInitialContext();
iniCtx.createSubcontext("jmx").createSubcontext("invoker");
StringRefAddr addr = new StringRefAddr(JMXServiceURL.class.getName(), jmxConnector.getServiceURL().toString());
Reference ref = new Reference(MBeanServerConnection.class.getName(), addr, RMIAdaptorFactory.class.getName(), null);
@@ -135,13 +133,13 @@
log.log(LogService.LOG_ERROR, "Cannot bind RMIAdoaptor", ex);
}
- return naming;
+ return iniCtx;
}
@Override
public void removedService(ServiceReference reference, Object service)
{
- NamingService naming = (NamingService)service;
+ InitialContext iniCtx = (InitialContext)service;
// Stop JMXConnectorService
stopJMXConnectorService();
@@ -149,7 +147,6 @@
// Unbind the RMIAdaptor
try
{
- InitialContext iniCtx = naming.getInitialContext();
iniCtx.unbind(rmiAdaptorPath);
log.log(LogService.LOG_INFO, "MBeanServerConnection unbound from: " + rmiAdaptorPath);
Modified: projects/jboss-osgi/trunk/bundle/jndi/.classpath
===================================================================
--- projects/jboss-osgi/trunk/bundle/jndi/.classpath 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/jndi/.classpath 2009-05-19 14:29:27 UTC (rev 89051)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Deleted: projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/NamingService.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/NamingService.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/NamingService.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -1,42 +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.jndi;
-
-//$Id$
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * A service that gives access to JNDI
- *
- * @author thomas.diesler at jboss.com
- * @since 05-May-2009
- */
-public interface NamingService
-{
- /**
- * Get the InitialContext
- * @throws NamingException if a naming exception is encountered
- */
- InitialContext getInitialContext() throws NamingException;
-}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/InitialContextFactory.java (from rev 88709, projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/NamingServiceFactory.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/InitialContextFactory.java (rev 0)
+++ projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/InitialContextFactory.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -0,0 +1,82 @@
+/*
+ * 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.jndi.internal;
+
+//$Id$
+
+import java.util.Hashtable;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.naming.NamingContextFactory;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.ServiceFactory;
+import org.osgi.framework.ServiceRegistration;
+
+/**
+ * A {@link ServiceFactory} for the {@link NamingService}
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 24-Apr-2009
+ */
+public class InitialContextFactory implements ServiceFactory
+{
+ private String jndiHost, jndiPort;
+
+ public InitialContextFactory(String jndiHost, String jndiPort)
+ {
+ this.jndiHost = jndiHost;
+ this.jndiPort = jndiPort;
+ }
+
+ @SuppressWarnings("unchecked")
+ public Object getService(Bundle bundle, ServiceRegistration registration)
+ {
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+
+ Hashtable env = new Hashtable();
+ env.put("java.naming.factory.initial", NamingContextFactory.class.getName());
+ env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+ env.put("java.naming.provider.url", "jnp://" + jndiHost + ":" + jndiPort);
+
+ InitialContext iniCtx = new InitialContext(env);
+ return iniCtx;
+ }
+ catch (NamingException ex)
+ {
+ throw new IllegalStateException("Cannot get the InitialContext", ex);
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(ctxLoader);
+ }
+ }
+
+ public void ungetService(Bundle bundle, ServiceRegistration registration, Object service)
+ {
+ // nothing to do
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/NamingServiceFactory.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/NamingServiceFactory.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/NamingServiceFactory.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -1,83 +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.jndi.internal;
-
-//$Id$
-
-import java.util.Hashtable;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.naming.NamingContextFactory;
-import org.jboss.osgi.jndi.NamingService;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * A {@link ServiceFactory} for the {@link NamingService}
- *
- * @author thomas.diesler at jboss.com
- * @since 24-Apr-2009
- */
-public class NamingServiceFactory implements ServiceFactory
-{
- private String jndiHost, jndiPort;
-
- public NamingServiceFactory(String jndiHost, String jndiPort)
- {
- this.jndiHost = jndiHost;
- this.jndiPort = jndiPort;
- }
-
- @SuppressWarnings("unchecked")
- public Object getService(Bundle bundle, ServiceRegistration registration)
- {
- ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
- try
- {
- Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-
- Hashtable env = new Hashtable();
- env.put("java.naming.factory.initial", NamingContextFactory.class.getName());
- env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- env.put("java.naming.provider.url", "jnp://" + jndiHost + ":" + jndiPort);
-
- InitialContext iniCtx = new InitialContext(env);
- return new NamingServiceImpl(iniCtx);
- }
- catch (NamingException ex)
- {
- throw new IllegalStateException("Cannot get the InitialContext", ex);
- }
- finally
- {
- Thread.currentThread().setContextClassLoader(ctxLoader);
- }
- }
-
- public void ungetService(Bundle bundle, ServiceRegistration registration, Object service)
- {
- // nothing to do
- }
-}
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/NamingServiceImpl.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/NamingServiceImpl.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/NamingServiceImpl.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -1,50 +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.jndi.internal;
-
-//$Id$
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.osgi.jndi.NamingService;
-
-/**
- * An implementation of the {@link NamingService}
- *
- * @author thomas.diesler at jboss.com
- * @since 24-Apr-2009
- */
-public class NamingServiceImpl implements NamingService
-{
- private InitialContext initialContext;
-
- public NamingServiceImpl(InitialContext initialContext)
- {
- this.initialContext = initialContext;
- }
-
- public InitialContext getInitialContext() throws NamingException
- {
- return initialContext;
- }
-}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/ServiceActivator.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/ServiceActivator.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/bundle/jndi/src/main/java/org/jboss/osgi/jndi/internal/ServiceActivator.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -23,8 +23,9 @@
//$Id$
+import javax.naming.InitialContext;
+
import org.jboss.osgi.common.log.LogServiceTracker;
-import org.jboss.osgi.jndi.NamingService;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
@@ -63,8 +64,8 @@
jnpServer = new JNPServer(context, jndiHost, Integer.parseInt(jndiPort), Integer.parseInt(jndiRmiPort));
jnpServer.start();
- context.registerService(NamingService.class.getName(), new NamingServiceFactory(jndiHost, jndiPort), null);
- log.log(LogService.LOG_DEBUG, "NamingService registered");
+ context.registerService(InitialContext.class.getName(), new InitialContextFactory(jndiHost, jndiPort), null);
+ log.log(LogService.LOG_DEBUG, "InitialContext registered");
}
public void stop(BundleContext context)
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/pom.xml 2009-05-19 14:29:27 UTC (rev 89051)
@@ -58,13 +58,13 @@
<version.jboss.jacc>1.1.0.GA</version.jboss.jacc>
<version.jboss.jdocbook.plugin>2.1.2</version.jboss.jdocbook.plugin>
<version.jboss.jdocbook.style>1.1.0</version.jboss.jdocbook.style>
- <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
- <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
+ <version.jboss.logging>2.0.5.GA</version.jboss.logging>
<version.jboss.metadata>1.0.0.CR11</version.jboss.metadata>
<version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer>
+ <version.jboss.osgi.husky>1.0.0-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.test>1.0.5.GA</version.jboss.test>
<version.jbossxb.bundle>2.0.0-SNAPSHOT</version.jbossxb.bundle>
- <version.junit>4.4</version.junit>
+ <version.junit>4.6</version.junit>
<version.knopflerfish>2.2.0</version.knopflerfish>
<version.log4j>1.2.14</version.log4j>
<version.osgi>r4v41</version.osgi>
@@ -152,12 +152,12 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging.spi}</version>
+ <version>${version.jboss.logging}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
- <version>${version.jboss.logging.log4j}</version>
+ <version>${version.jboss.logging}</version>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
@@ -179,6 +179,11 @@
<artifactId>jnpserver</artifactId>
<version>${version.jbossas}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-husky-harness</artifactId>
+ <version>${version.jboss.osgi.husky}</version>
+ </dependency>
<!-- Bundle Dependencies -->
<dependency>
@@ -341,6 +346,10 @@
<name>org.apache.xerces.xni.parser.XMLParserConfiguration</name>
<value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value>
</property>
+ <property>
+ <name>org.jboss.osgi.husky.Invoker</name>
+ <value>org.jboss.osgi.husky.internal.LocalInvoker</value>
+ </property>
<!--
Implement URLStreamHandlerService
https://jira.jboss.org/jira/browse/JBOSGI-75
Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -163,7 +163,8 @@
}
catch (BundleException ex)
{
- log.error("Cannot install bundle: " + bundleURL, ex);
+ stop();
+ throw new IllegalStateException("Cannot install bundle: " + bundleURL, ex);
}
}
@@ -179,7 +180,8 @@
}
catch (BundleException ex)
{
- log.error("Cannot start bundle: " + bundleURL, ex);
+ stop();
+ throw new IllegalStateException("Cannot install bundle: " + bundleURL, ex);
}
}
}
Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -156,7 +156,8 @@
}
catch (BundleException ex)
{
- log.error("Cannot install bundle: " + bundleURL, ex);
+ stop();
+ throw new IllegalStateException("Cannot install bundle: " + bundleURL, ex);
}
}
@@ -175,7 +176,8 @@
}
catch (BundleException ex)
{
- log.error("Cannot start bundle: " + bundleURL, ex);
+ stop();
+ throw new IllegalStateException("Cannot start bundle: " + bundleURL, ex);
}
}
}
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -213,7 +213,8 @@
}
catch (BundleException ex)
{
- log.error("Cannot install bundle: " + bundleURL, ex);
+ stop();
+ throw new IllegalStateException("Cannot install bundle: " + bundleURL, ex);
}
}
@@ -229,7 +230,8 @@
}
catch (BundleException ex)
{
- log.error("Cannot start bundle: " + bundleURL, ex);
+ stop();
+ throw new IllegalStateException("Cannot start bundle: " + bundleURL, ex);
}
}
}
Modified: projects/jboss-osgi/trunk/spi/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/spi/pom.xml 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/spi/pom.xml 2009-05-19 14:29:27 UTC (rev 89051)
@@ -17,7 +17,23 @@
<!-- Dependencies -->
<dependencies>
+
+ <!-- Compile Dependencies -->
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</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>
@@ -30,19 +46,13 @@
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
+ <scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
<build>
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -37,7 +37,7 @@
import java.util.Set;
import org.jboss.osgi.spi.NotImplementedException;
-import org.jboss.util.StringPropertyReplacer;
+import org.jboss.osgi.spi.internal.StringPropertyReplacer;
/**
* A simple properties based bootstrap provider
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/bundle/ServiceActivator.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/bundle/ServiceActivator.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/bundle/ServiceActivator.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -26,7 +26,6 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.osgi.jndi.NamingService;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -41,10 +40,9 @@
{
public void start(BundleContext context)
{
- NamingService service = getNamingService(context);
try
{
- InitialContext iniCtx = service.getInitialContext();
+ InitialContext iniCtx = getInitialContext(context);
iniCtx.createSubcontext("test").bind("Foo", new String("Bar"));
}
catch (NamingException ex)
@@ -55,10 +53,9 @@
public void stop(BundleContext context)
{
- NamingService service = getNamingService(context);
try
{
- InitialContext iniCtx = service.getInitialContext();
+ InitialContext iniCtx = getInitialContext(context);
iniCtx.unbind("test");
}
catch (NamingException ex)
@@ -67,13 +64,13 @@
}
}
- private NamingService getNamingService(BundleContext context)
+ private InitialContext getInitialContext(BundleContext context)
{
- ServiceReference sref = context.getServiceReference(NamingService.class.getName());
+ ServiceReference sref = context.getServiceReference(InitialContext.class.getName());
if (sref == null)
- throw new IllegalStateException("NamingService not available");
+ throw new IllegalStateException("Cannot access the InitialContext");
- NamingService service = (NamingService)context.getService(sref);
- return service;
+ InitialContext initContext = (InitialContext)context.getService(sref);
+ return initContext;
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jndi/example-jndi.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jndi/example-jndi.bnd 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jndi/example-jndi.bnd 2009-05-19 14:29:27 UTC (rev 89051)
@@ -3,4 +3,4 @@
Bundle-SymbolicName: example-jndi
Bundle-Activator: org.jboss.test.osgi.example.jndi.bundle.ServiceActivator
Export-Package: org.jboss.test.osgi.example.jndi.bundle
-Import-Package: javax.naming, org.osgi.framework, org.jboss.osgi.jndi
\ No newline at end of file
+Import-Package: javax.naming, org.osgi.framework
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/shop/sports/ClimbingStore.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/shop/sports/ClimbingStore.java 2009-05-19 14:16:57 UTC (rev 89050)
+++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/shop/sports/ClimbingStore.java 2009-05-19 14:29:27 UTC (rev 89051)
@@ -32,7 +32,6 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import org.jboss.osgi.jndi.NamingService;
import org.jboss.test.osgi.trailblazer.PaymentService;
import org.jboss.test.osgi.trailblazer.Product;
import org.jboss.test.osgi.trailblazer.Shop;
@@ -54,10 +53,9 @@
{
this.context = context;
- NamingService namingService = getNamingService(context);
try
{
- Context ctx = namingService.getInitialContext();
+ Context ctx = getInitialContext(context);
ctx = ctx.createSubcontext("shop");
ctx = ctx.createSubcontext("climbing");
ctx = ctx.createSubcontext("products");
@@ -99,8 +97,7 @@
Collection<Product> products = new ArrayList<Product>();
try
{
- NamingService namingService = getNamingService(context);
- InitialContext iniCtx = namingService.getInitialContext();
+ InitialContext iniCtx = getInitialContext(context);
NamingEnumeration<NameClassPair> list = iniCtx.list("shop/climbing/products");
while (list.hasMoreElements())
@@ -126,8 +123,7 @@
{
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- NamingService namingService = getNamingService(context);
- InitialContext iniCtx = namingService.getInitialContext();
+ InitialContext iniCtx = getInitialContext(context);
product = (Product)iniCtx.lookup("shop/climbing/products/" + name);
product.setShop(this);
}
@@ -147,13 +143,13 @@
ctx.bind(p.getName(), p);
}
- private NamingService getNamingService(BundleContext context)
+ private InitialContext getInitialContext(BundleContext context)
{
- ServiceReference sref = context.getServiceReference(NamingService.class.getName());
+ ServiceReference sref = context.getServiceReference(InitialContext.class.getName());
if (sref == null)
- throw new IllegalStateException("Cannot access the NamingService");
+ throw new IllegalStateException("Cannot access the InitialContext");
- NamingService namingService = (NamingService)context.getService(sref);
- return namingService;
+ InitialContext initContext = (InitialContext)context.getService(sref);
+ return initContext;
}
}
More information about the jboss-cvs-commits
mailing list