Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 7484 invoked from network); 28 May 2006 20:11:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 May 2006 20:11:19 -0000 Received: (qmail 45925 invoked by uid 500); 28 May 2006 20:11:18 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 45784 invoked by uid 500); 28 May 2006 20:11:17 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 45773 invoked by uid 99); 28 May 2006 20:11:17 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 May 2006 13:11:17 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 May 2006 13:11:17 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id ECDBB1A9842; Sun, 28 May 2006 13:10:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r409992 - in /cocoon/trunk/core/cocoon-core: META-INF/MANIFEST.MF src/main/java/org/apache/cocoon/util/ClassUtils.java src/main/java/org/apache/cocoon/util/WildcardHelper.java Date: Sun, 28 May 2006 20:10:56 -0000 To: cvs@cocoon.apache.org From: danielf@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060528201056.ECDBB1A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: danielf Date: Sun May 28 13:10:56 2006 New Revision: 409992 URL: http://svn.apache.org/viewvc?rev=409992&view=rev Log: Reorganized the Java packages in cocoon-bootstrap so that we don't have any packages that are split between cocoon-bootstrap and cocoon-core. Added a manifest file so that it works as a bundle and also updated the manifest in the cocoon-core to reflect that some packages where moved and some jars updated to new versions. Part II Added: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ClassUtils.java - copied unchanged from r409821, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/util/ClassUtils.java cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/WildcardHelper.java - copied unchanged from r409821, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/util/WildcardHelper.java Modified: cocoon/trunk/core/cocoon-core/META-INF/MANIFEST.MF Modified: cocoon/trunk/core/cocoon-core/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/META-INF/MANIFEST.MF?rev=409992&r1=409991&r2=409992&view=diff ============================================================================== --- cocoon/trunk/core/cocoon-core/META-INF/MANIFEST.MF (original) +++ cocoon/trunk/core/cocoon-core/META-INF/MANIFEST.MF Sun May 28 13:10:56 2006 @@ -9,19 +9,20 @@ target/osgi/lib/ant-launcher-1.6.5.jar, target/osgi/lib/ant-optional-1.5.1.jar, target/osgi/lib/ant-trax-1.6.5.jar, + target/osgi/lib/activemq-optional-3.2.jar, + target/osgi/lib/aopalliance-1.0.jar, target/osgi/lib/avalon-framework-api-4.3.jar, target/osgi/lib/avalon-framework-impl-4.3.jar, target/osgi/lib/avalon-logkit-2.1.jar, target/osgi/lib/commons-cli-1.0.jar, target/osgi/lib/commons-collections-3.1.jar, target/osgi/lib/commons-io-1.2.jar, - target/osgi/lib/commons-jci-r306555.jar, target/osgi/lib/commons-jexl-1.0.jar, target/osgi/lib/commons-jxpath-1.2.jar, target/osgi/lib/commons-lang-2.1.jar, target/osgi/lib/commons-logging-1.0.4.jar, target/osgi/lib/concurrent-1.3.4.jar, - target/osgi/lib/ehcache-1.1.jar, + target/osgi/lib/ehcache-1.2.jar, target/osgi/lib/excalibur-component-2.1.jar, target/osgi/lib/excalibur-instrument-api-2.1.jar, target/osgi/lib/excalibur-instrument-mgr-api-2.1.jar, @@ -37,19 +38,25 @@ target/osgi/lib/jakarta-bcel-20040329.jar, target/osgi/lib/jakarta-regexp-1.4.jar, target/osgi/lib/js-1.6R2.jar, + target/osgi/lib/jstl-1.0.jar, target/osgi/lib/log4j-1.2.13.jar, target/osgi/lib/mx4j-3.0.1.jar, - target/osgi/lib/spring-1.2.6.jar, + target/osgi/lib/oro-2.0.8.jar, + target/osgi/lib/spring-aop-1.2.6.jar, + target/osgi/lib/spring-beans-1.2.6.jar, + target/osgi/lib/spring-context-1.2.6.jar, + target/osgi/lib/spring-core-1.2.6.jar, + target/osgi/lib/spring-web-1.2.6.jar, + target/osgi/lib/standard-1.0.6.jar, target/osgi/lib/xalan-2.7.0.jar, - target/osgi/lib/xercesImpl-2.7.1.jar, + target/osgi/lib/xercesImpl-2.8.0.jar, target/osgi/lib/xml-apis-1.3.02.jar, target/osgi/lib/xmlbeans-1.0.3.jar, target/osgi/lib/xml-resolver-1.1.jar, target/osgi/lib/easymock-1.1.jar, target/osgi/lib/jmock-1.0.1.jar, target/osgi/lib/junit-3.8.2.jar, - target/osgi/lib/xmlunit-0.8.jar, - target/osgi/lib/activemq-optional-3.2.jar + target/osgi/lib/xmlunit-0.8.jar Export-Package: junit.framework, junit.textui, org.apache.avalon.framework.logger, @@ -60,7 +67,6 @@ org.apache.cocoon.caching, org.apache.cocoon.caching.impl, org.apache.cocoon.components, - org.apache.cocoon.components.classloader, org.apache.cocoon.components.crawler, org.apache.cocoon.components.fam, org.apache.cocoon.components.flow, @@ -131,6 +137,8 @@ Import-Package: javax.servlet;version="2.3.0", javax.servlet.http;version="2.3.0", org.apache.cocoon.blocks, + org.apache.cocoon.classloader, + org.apache.commons.jci.monitor, org.osgi.framework, org.osgi.service.component, org.osgi.service.log