geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r926146 - in /geronimo/server/trunk/plugins: activemq/activemq-broker-blueprint/src/main/history/ aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/ aries/geronimo-aries-resolver/src/main/java/org/apache/geronim...
Date Mon, 22 Mar 2010 15:44:11 GMT
Author: gawor
Date: Mon Mar 22 15:44:11 2010
New Revision: 926146

URL: http://svn.apache.org/viewvc?rev=926146&view=rev
Log:
some more dependencies updates and api updates for aries resolver

Modified:
    geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/GeronimoOBRResolver.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/ApplicationResourceImpl.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/RequirementImpl.java
    geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml?rev=926146&r1=926145&r2=926146&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
Mon Mar 22 15:44:11 2010
@@ -81,4 +81,9 @@
         <artifactId>xbean-blueprint</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/GeronimoOBRResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/GeronimoOBRResolver.java?rev=926146&r1=926145&r2=926146&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/GeronimoOBRResolver.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/GeronimoOBRResolver.java
Mon Mar 22 15:44:11 2010
@@ -91,7 +91,7 @@ public class GeronimoOBRResolver impleme
             TransformerFactory.newInstance().newTransformer().transform(new DOMSource(doc),
                     new StreamResult(f));
 
-            appRepository = repositoryAdmin.repository(f.toURI().toURL());
+            appRepository = repositoryAdmin.getHelper().repository(f.toURI().toURL());
 
             f.delete();
         } catch (Exception e) {

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/ApplicationResourceImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/ApplicationResourceImpl.java?rev=926146&r1=926145&r2=926146&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/ApplicationResourceImpl.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/ApplicationResourceImpl.java
Mon Mar 22 15:44:11 2010
@@ -58,7 +58,7 @@ public class ApplicationResourceImpl imp
             boolean optional = Boolean.valueOf(resolution);
 
             String f = ManifestHeaderProcessor.generateFilter(Resource.SYMBOLIC_NAME, c.getContentName(),
c.getAttributes());
-            Filter filter = repositoryAdmin.filter(f);
+            Filter filter = repositoryAdmin.getHelper().filter(f);
             _requirements[i] = new RequirementImpl("bundle", filter, false, optional, false,
comment);
         }
     }
@@ -106,4 +106,8 @@ public class ApplicationResourceImpl imp
     public boolean isLocal() {
         return false;
     }
+
+    public Long getSize() {
+        return null;
+    }
 }

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/RequirementImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/RequirementImpl.java?rev=926146&r1=926145&r2=926146&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/RequirementImpl.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/RequirementImpl.java
Mon Mar 22 15:44:11 2010
@@ -74,6 +74,6 @@ public class RequirementImpl implements 
     }
 
     public boolean isSatisfied(Capability capability) {
-        return filter.match(new MapToDictionary(capability.getProperties()));
+        return filter.match(new MapToDictionary(capability.getPropertiesAsMap()));
     }
 }

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=926146&r1=926145&r2=926146&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 Mon Mar 22
15:44:11 2010
@@ -218,6 +218,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=926146&r1=926145&r2=926146&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml Mon
Mar 22 15:44:11 2010
@@ -66,9 +66,4 @@
         <artifactId>geronimo-jpa_2.0_spec</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=926146&r1=926145&r2=926146&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Mon Mar
22 15:44:11 2010
@@ -112,11 +112,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-spec-corba</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml?rev=926146&r1=926145&r2=926146&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml Mon Mar
22 15:44:11 2010
@@ -141,9 +141,4 @@
         <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>



Mime
View raw message