geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r910793 [2/2] - in /geronimo/server/trunk: framework/buildsupport/car-maven-plugin/ framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ framework/configs/ framework/configs/client-system/src/main/hist...
Date Wed, 17 Feb 2010 01:30:14 GMT
Added: geronimo/server/trunk/framework/modules/geronimo-obr/src/main/java/org/apache/geronimo/obr/model/Resource.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-obr/src/main/java/org/apache/geronimo/obr/model/Resource.java?rev=910793&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-obr/src/main/java/org/apache/geronimo/obr/model/Resource.java
(added)
+++ geronimo/server/trunk/framework/modules/geronimo-obr/src/main/java/org/apache/geronimo/obr/model/Resource.java
Wed Feb 17 01:30:12 2010
@@ -0,0 +1,411 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation,
v2.0.3-b01-fcs 
+// 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.12.17 at 12:58:15 PM EST 
+//
+
+
+package org.apache.geronimo.obr.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string"
minOccurs="0"/>
+ *         &lt;element name="size" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/>
+ *         &lt;element name="documentation" type="{http://www.w3.org/2001/XMLSchema}string"
minOccurs="0"/>
+ *         &lt;element name="source" type="{http://www.w3.org/2001/XMLSchema}string"
minOccurs="0"/>
+ *         &lt;element name="license" type="{http://www.w3.org/2001/XMLSchema}string"
minOccurs="0"/>
+ *         &lt;element ref="{}category" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element ref="{}capability" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element ref="{}require" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute ref="{}id use="required""/>
+ *       &lt;attribute name="presentationname" type="{http://www.w3.org/2001/XMLSchema}string"
/>
+ *       &lt;attribute name="symbolicname" type="{http://www.w3.org/2001/XMLSchema}string"
/>
+ *       &lt;attribute name="uri" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="version" type="{http://www.w3.org/2001/XMLSchema}string"
/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "description",
+    "size",
+    "documentation",
+    "source",
+    "license",
+    "category",
+    "capability",
+    "require"
+})
+@XmlRootElement(name = "resource")
+public class Resource {
+
+    protected String description;
+    protected Long size;
+    protected String documentation;
+    protected String source;
+    protected String license;
+    protected List<Category> category;
+    protected List<Capability> capability;
+    protected List<Require> require;
+    @XmlAttribute(required = true)
+    protected String id;
+    @XmlAttribute
+    protected String presentationname;
+    @XmlAttribute
+    protected String symbolicname;
+    @XmlAttribute
+    protected String uri;
+    @XmlAttribute
+    protected String version;
+
+    /**
+     * 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 size property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    public Long getSize() {
+        return size;
+    }
+
+    /**
+     * Sets the value of the size property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setSize(Long value) {
+        this.size = value;
+    }
+
+    /**
+     * Gets the value of the documentation property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDocumentation() {
+        return documentation;
+    }
+
+    /**
+     * Sets the value of the documentation property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDocumentation(String value) {
+        this.documentation = value;
+    }
+
+    /**
+     * Gets the value of the source property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * Sets the value of the source property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSource(String value) {
+        this.source = value;
+    }
+
+    /**
+     * Gets the value of the license property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getLicense() {
+        return license;
+    }
+
+    /**
+     * Sets the value of the license property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setLicense(String value) {
+        this.license = value;
+    }
+
+    /**
+     * Gets the value of the category 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 category property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getCategory().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Category }
+     * 
+     * 
+     */
+    public List<Category> getCategory() {
+        if (category == null) {
+            category = new ArrayList<Category>();
+        }
+        return this.category;
+    }
+
+    /**
+     * Gets the value of the capability 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 capability
property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getCapability().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Capability }
+     * 
+     * 
+     */
+    public List<Capability> getCapability() {
+        if (capability == null) {
+            capability = new ArrayList<Capability>();
+        }
+        return this.capability;
+    }
+
+    /**
+     * Gets the value of the require 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 require property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRequire().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Require }
+     * 
+     * 
+     */
+    public List<Require> getRequire() {
+        if (require == null) {
+            require = new ArrayList<Require>();
+        }
+        return this.require;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the presentationname property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPresentationname() {
+        return presentationname;
+    }
+
+    /**
+     * Sets the value of the presentationname property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPresentationname(String value) {
+        this.presentationname = value;
+    }
+
+    /**
+     * Gets the value of the symbolicname property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSymbolicname() {
+        return symbolicname;
+    }
+
+    /**
+     * Sets the value of the symbolicname property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSymbolicname(String value) {
+        this.symbolicname = value;
+    }
+
+    /**
+     * Gets the value of the uri property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getUri() {
+        return uri;
+    }
+
+    /**
+     * Sets the value of the uri property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setUri(String value) {
+        this.uri = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets the value of the version property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVersion(String value) {
+        this.version = value;
+    }
+
+}

Propchange: geronimo/server/trunk/framework/modules/geronimo-obr/src/main/java/org/apache/geronimo/obr/model/Resource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-obr/src/main/java/org/apache/geronimo/obr/model/Resource.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-obr/src/main/java/org/apache/geronimo/obr/model/Resource.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/modules/geronimo-obr/src/main/xsd/SchemaObr.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-obr/src/main/xsd/SchemaObr.xsd?rev=910793&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-obr/src/main/xsd/SchemaObr.xsd (added)
+++ geronimo/server/trunk/framework/modules/geronimo-obr/src/main/xsd/SchemaObr.xsd Wed Feb
17 01:30:12 2010
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<!-- definition of simple elements -->
+
+<!-- definition of attribute  -->
+<xs:attribute name="name"     type="xs:string"/>
+<xs:attribute name="filter"   type="xs:string"/>
+<xs:attribute name="extend"   type="xs:boolean"/>
+<xs:attribute name="multiple" type="xs:boolean"/>
+<xs:attribute name="optional" type="xs:boolean"/>
+<xs:attribute name="id" type="xs:string"/>
+<xs:attribute name="n" type="xs:string"/>
+<xs:attribute name="v" type="xs:string"/>
+<xs:attribute name="t" type="xs:string"/>
+
+<xs:element name="require">
+  <xs:complexType mixed="true">
+    <xs:attribute ref="name"     use="required"/>
+    <xs:attribute ref="filter"   use="required"/>
+    <xs:attribute ref="extend"   use="required"/>
+    <xs:attribute ref="multiple" use="required"/>
+    <xs:attribute ref="optional" use="required"/>
+  </xs:complexType>
+</xs:element>
+
+<xs:element name="category">
+  <xs:complexType>
+    <xs:attribute ref="id" use="required"/>
+  </xs:complexType>
+</xs:element>
+
+<xs:element name="p">
+  <xs:complexType>
+    <xs:attribute ref="n" use="required"/>
+    <xs:attribute ref="v" use="required"/>
+    <xs:attribute ref="t" />
+  </xs:complexType>
+</xs:element>
+
+
+<xs:element name="capability">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element ref="p" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="name" type="xs:string" use="required"/>
+  </xs:complexType>
+</xs:element>
+
+<xs:element name="resource">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="size" type="xs:long" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="documentation" type="xs:string" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="source" type="xs:string" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="license" type="xs:string" minOccurs="0" maxOccurs="1"/>
+      <xs:element ref="category" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="capability" minOccurs="0" maxOccurs="unbounded"/> 
+      <xs:element ref="require" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute ref="id" use="required"/>
+    <xs:attribute name="presentationname" type="xs:string" use="optional"/>
+    <xs:attribute name="symbolicname" type="xs:string" use="optional"/>
+    <xs:attribute name="uri" type="xs:string" use="optional"/>
+    <xs:attribute name="version" type="xs:string" use="optional"/>
+  </xs:complexType>
+</xs:element>
+
+<xs:element name="repository">
+  <xs:complexType>
+    <xs:sequence>
+        <xs:element ref="resource" minOccurs="0" maxOccurs="unbounded"/> 
+    </xs:sequence>
+    <xs:attribute name="name" type="xs:string" use="required"/>
+    <xs:attribute name="lastmodified" type="xs:string" use="optional"/>
+  </xs:complexType>
+</xs:element>
+
+</xs:schema>

Propchange: geronimo/server/trunk/framework/modules/geronimo-obr/src/main/xsd/SchemaObr.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-obr/src/main/xsd/SchemaObr.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-obr/src/main/xsd/SchemaObr.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=910793&r1=910792&r2=910793&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Wed Feb 17 01:30:12 2010
@@ -107,6 +107,26 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.bundlerepository</artifactId>
+            <version>1.5.0-SNAPSHOT</version>
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.felix</groupId>-->
+                    <!--<artifactId>org.apache.felix.shell</artifactId>-->
+                <!--</exclusion>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.felix</groupId>-->
+                    <!--<artifactId>org.osgi.core</artifactId>-->
+                <!--</exclusion>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.osgi</groupId>-->
+                    <!--<artifactId>org.osgi.core</artifactId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
             <artifactId>testsupport-common</artifactId>
             <version>${version}</version>
@@ -162,7 +182,8 @@
                 <configuration>
                     <instructions>
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
-                        <Import-Package>org.apache.log4j.helpers;resolution:=optional,*</Import-Package>
+                        <Import-Package>org.apache.log4j.helpers;resolution:=optional,
+                            *</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java?rev=910793&r1=910792&r2=910793&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
Wed Feb 17 01:30:12 2010
@@ -46,7 +46,9 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.BundleException;
+import org.osgi.framework.ServiceReference;
 import org.osgi.framework.SynchronousBundleListener;
+import org.osgi.service.obr.RepositoryAdmin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,6 +61,8 @@
 
     private final BundleContext bundleContext;
     private final Collection<Repository> repositories;
+
+    private final RepositoryAdmin repositoryAdmin;
     
     private final Map<Bundle, PluginArtifactType> pluginMap = 
         Collections.synchronizedMap(new WeakHashMap<Bundle, PluginArtifactType>());
@@ -68,6 +72,8 @@
         this.bundleContext = bundleContext;
         this.repositories = repositories;
         bundleContext.addBundleListener(this);
+        ServiceReference ref = bundleContext.getServiceReference(RepositoryAdmin.class.getName());
+        repositoryAdmin = ref == null? null: (RepositoryAdmin) bundleContext.getService(ref);
     }
 
     public void bundleChanged(BundleEvent bundleEvent) {
@@ -101,7 +107,23 @@
         }
         return pluginArtifactType;
     }
-    
+
+    private void installRepository(Bundle bundle) {
+        if (repositoryAdmin != null) {
+            URL info = bundle.getEntry("OSGI-INF/obr/repository.xml");
+            if (info != null) {
+                log.info("found repository.xml for bundle " + bundle);
+                try {
+                    repositoryAdmin.addRepository(info);
+                } catch (Exception e) {
+                    log.info("Error adding respository.xml for bundle " + bundle, e);
+                }
+            } else {
+                log.info("did not find geronimo-plugin.xml for bundle " + bundle);
+            }
+        }
+    }
+
     private PluginArtifactType getCachedPluginMetadata(Bundle bundle) {        
         PluginArtifactType pluginArtifactType = pluginMap.get(bundle);
         if (pluginArtifactType == null) {
@@ -109,6 +131,8 @@
             if (pluginArtifactType != null) {
                 pluginMap.put(bundle, pluginArtifactType);
             }
+            //take this opportunity to install obr repo fragment
+            installRepository(bundle);
         }
         return pluginArtifactType;
     }
@@ -118,12 +142,13 @@
         if (pluginArtifactType != null) {
             List<DependencyType> dependencies = pluginArtifactType.getDependency();
             try {
-                for (DependencyType dependencyType : dependencies) {
+                tag: for (DependencyType dependencyType : dependencies) {
                     log.info("Installing artifact: " + dependencyType);
                     Artifact artifact = dependencyType.toArtifact();
                     String location = locateBundle(artifact);
                     for (Bundle test: bundleContext.getBundles()) {
                         if (location.equals(test.getLocation())) {
+//                            break tag;
                             continue;
                         }
                     }

Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=910793&r1=910792&r2=910793&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Wed Feb 17 01:30:12 2010
@@ -50,6 +50,7 @@
         <module>geronimo-deploy-tool</module>
         <module>geronimo-shell-base</module>
         <module>geronimo-blueprint</module>
+        <module>geronimo-obr</module>
   </modules>
 
     <profiles>

Modified: geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml?rev=910793&r1=910792&r2=910793&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml Wed Feb 17 01:30:12 2010
@@ -47,6 +47,28 @@
             <artifactId>geronimo-aries-builder</artifactId>
             <version>${version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.api</artifactId>
+            <version>1.0.0-incubating-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.management</artifactId>
+            <version>1.0.0-incubating-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.runtime</artifactId>
+            <version>1.0.0-incubating-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.resolver.obr</artifactId>
+            <version>1.0.0-incubating-SNAPSHOT</version>
+        </dependency>
+
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml?rev=910793&r1=910792&r2=910793&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml Wed
Feb 17 01:30:12 2010
@@ -8,15 +8,45 @@
     </module-id>
     <dependency>
         <groupId>org.apache.aries.application</groupId>
+        <artifactId>org.apache.aries.application.api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.application</groupId>
+        <artifactId>org.apache.aries.application.management</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.application</groupId>
+        <artifactId>org.apache.aries.application.resolver.obr</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.application</groupId>
+        <artifactId>org.apache.aries.application.runtime</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.application</groupId>
         <artifactId>org.apache.aries.application.utils</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.service.obr</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.components</groupId>
         <artifactId>geronimo-jaspi</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-transaction</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-deploy-config</artifactId>
         <type>jar</type>
@@ -33,6 +63,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-naming</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-security</artifactId>
         <type>jar</type>
     </dependency>
@@ -78,22 +113,27 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.schema</groupId>
+        <artifactId>geronimo-schema-javaee_6</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.schema</groupId>
         <artifactId>geronimo-schema-jee_5</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-activation_1.1_spec</artifactId>
+        <artifactId>geronimo-annotation_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-annotation_1.0_spec</artifactId>
+        <artifactId>geronimo-ejb_3.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-ejb_3.1_spec</artifactId>
+        <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -118,7 +158,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+        <artifactId>geronimo-jaxws_2.2_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -138,6 +178,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.howl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         <type>jar</type>
     </dependency>
@@ -156,4 +201,9 @@
         <artifactId>xbean-finder</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-naming</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java?rev=910793&r1=910792&r2=910793&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
Wed Feb 17 01:30:12 2010
@@ -29,7 +29,7 @@
 import java.util.zip.ZipEntry;
 
 import org.apache.aries.application.ApplicationMetadata;
-import org.apache.aries.application.ApplicationMetadataManager;
+import org.apache.aries.application.ApplicationMetadataFactory;
 import org.apache.aries.application.Content;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.ConfigurationBuilder;
@@ -99,11 +99,11 @@
         return repository;   
     }
     
-    private ApplicationMetadataManager getApplicationMetadataManager() {
+    private ApplicationMetadataFactory getApplicationMetadataManager() {
         ServiceReference ref = 
-            bundleContext.getServiceReference(ApplicationMetadataManager.class.getName());
+            bundleContext.getServiceReference(ApplicationMetadataFactory.class.getName());
         if (ref != null) {
-            return (ApplicationMetadataManager) bundleContext.getService(ref);
+            return (ApplicationMetadataFactory) bundleContext.getService(ref);
         } else {
             return null;
         }
@@ -201,7 +201,7 @@
             return null;
         }
         
-        ApplicationMetadataManager service = getApplicationMetadataManager();
+        ApplicationMetadataFactory service = getApplicationMetadataManager();
         if (service == null) {
             return null;
         }
@@ -209,7 +209,7 @@
         ApplicationMetadata appMetadata = null;
         try {
             InputStream in = jarFile.getInputStream(appManifest);
-            appMetadata = service.parseApplication(in);
+            appMetadata = service.parseApplicationMetadata(in);
         } catch (IOException e) {
             throw new DeploymentException("Failed to parse application metadata", e);
         }

Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=910793&r1=910792&r2=910793&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Wed Feb 17
01:30:12 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>axis2</artifactId>
@@ -48,6 +48,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.bundlerepository</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
         <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml?rev=910793&r1=910792&r2=910793&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
Wed Feb 17 01:30:12 2010
@@ -8,6 +8,11 @@
     </module-id>
     <dependency>
         <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.bundlerepository</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
         <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml?rev=910793&r1=910792&r2=910793&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml Wed Feb 17 01:30:12 2010
@@ -71,6 +71,12 @@
             <version>${version}</version>
         </dependency>
 
+        <!-- this is an optional import in geronimo components transaction. If we don't
install it now,
+        it won't get picked up -->
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.howl</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>

Modified: geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml?rev=910793&r1=910792&r2=910793&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml Wed
Feb 17 01:30:12 2010
@@ -27,6 +27,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.bundlerepository</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>transaction-1_6</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=910793&r1=910792&r2=910793&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Wed Feb 17 01:30:12 2010
@@ -137,6 +137,7 @@
         <!--<module>procrun</module>-->
         <module>jetty8</module>
         <module>tomcat</module>
+        <module>aries</module>
         <module>wab</module>
     </modules>
 

Modified: geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml?rev=910793&r1=910792&r2=910793&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml Wed Feb 17 01:30:12 2010
@@ -125,6 +125,13 @@
             <type>car</type>
         </dependency>
 
+        <dependency> 
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>aries-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer-1_6</artifactId>



Mime
View raw message