Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 18549 invoked from network); 22 Mar 2010 15:44:37 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 Mar 2010 15:44:37 -0000 Received: (qmail 96913 invoked by uid 500); 22 Mar 2010 15:44:37 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 96846 invoked by uid 500); 22 Mar 2010 15:44:36 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 96839 invoked by uid 99); 22 Mar 2010 15:44:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Mar 2010 15:44:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Mar 2010 15:44:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C675D23889BB; Mon, 22 Mar 2010 15:44:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100322154411.C675D23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ xbean-blueprint jar + + org.apache.xbean + xbean-finder + jar + 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 @@ org.apache.xbean + xbean-finder + jar + + + org.apache.xbean xbean-reflect jar 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 @@ geronimo-jpa_2.0_spec jar - - org.apache.xbean - xbean-finder - jar - 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 @@ jar - org.apache.xbean - xbean-finder - jar - - org.apache.yoko yoko-spec-corba jar 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 @@ org.apache.servicemix.specs.saaj-api-1.3 jar - - org.apache.xbean - xbean-finder - jar -