cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r409990 - in /cocoon/trunk/core/cocoon-bootstrap: ./ META-INF/ src/main/java/org/apache/cocoon/bootstrap/ src/main/java/org/apache/cocoon/bootstrap/servlet/ src/main/java/org/apache/cocoon/classloader/ src/main/java/org/apache/cocoon/servle...
Date Sun, 28 May 2006 20:09:45 GMT
Author: danielf
Date: Sun May 28 13:09:44 2006
New Revision: 409990

URL: http://svn.apache.org/viewvc?rev=409990&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 I

Added:
    cocoon/trunk/core/cocoon-bootstrap/META-INF/
    cocoon/trunk/core/cocoon-bootstrap/META-INF/MANIFEST.MF   (with props)
    cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/
    cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/
      - copied from r409821, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/
    cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java
      - copied, changed from r409985, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/BootstrapClassLoaderManager.java
    cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServlet.java
      - copied, changed from r409985, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/ParanoidServlet.java
    cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServletFilter.java
      - copied, changed from r409985, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/ParanoidServletFilter.java
    cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardHelper.java
      - copied, changed from r409821, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/util/WildcardHelper.java
Removed:
    cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/
    cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/util/ClassUtils.java
    cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/util/WildcardHelper.java
Modified:
    cocoon/trunk/core/cocoon-bootstrap/pom.xml
    cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/DefaultClassLoader.java

Added: cocoon/trunk/core/cocoon-bootstrap/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/META-INF/MANIFEST.MF?rev=409990&view=auto
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/META-INF/MANIFEST.MF (added)
+++ cocoon/trunk/core/cocoon-bootstrap/META-INF/MANIFEST.MF Sun May 28 13:09:44 2006
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: cocoon_bootstrap
+Bundle-SymbolicName: cocoon_bootstrap
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Bundle-ClassPath: target/osgi/lib/commons-jci-r306555.jar
+Export-Package: org.apache.cocoon.bootstrap.servlet,
+ org.apache.cocoon.classloader,
+ org.apache.commons.jci.monitor
+Import-Package: javax.servlet;version="2.3.0",
+ javax.servlet.http;version="2.3.0"

Propchange: cocoon/trunk/core/cocoon-bootstrap/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/core/cocoon-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/pom.xml?rev=409990&r1=409989&r2=409990&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/pom.xml (original)
+++ cocoon/trunk/core/cocoon-bootstrap/pom.xml Sun May 28 13:09:44 2006
@@ -31,6 +31,18 @@
   <packaging>jar</packaging>
   <name>Cocoon Bootstrap Implementation</name>
   <description/>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-maven-eclipse-plugin</artifactId>
+        <version>2.3-SNAPSHOT</version>
+        <configuration>
+          <pde>true</pde>
+        </configuration>
+      </plugin>         
+    </plugins>
+  </build>
   <dependencies>
     <dependency>
       <groupId>commons-jci</groupId>

Copied: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java
(from r409985, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/BootstrapClassLoaderManager.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java?p2=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java&p1=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/BootstrapClassLoaderManager.java&r1=409985&r2=409990&rev=409990&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/BootstrapClassLoaderManager.java
(original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java
Sun May 28 13:09:44 2006
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.servlet;
+package org.apache.cocoon.bootstrap.servlet;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServlet.java
(from r409985, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/ParanoidServlet.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServlet.java?p2=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServlet.java&p1=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/ParanoidServlet.java&r1=409985&r2=409990&rev=409990&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/ParanoidServlet.java
(original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServlet.java
Sun May 28 13:09:44 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.servlet;
+package org.apache.cocoon.bootstrap.servlet;
 
 import java.io.IOException;
 

Copied: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServletFilter.java
(from r409985, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/ParanoidServletFilter.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServletFilter.java?p2=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServletFilter.java&p1=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/ParanoidServletFilter.java&r1=409985&r2=409990&rev=409990&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/servlet/ParanoidServletFilter.java
(original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServletFilter.java
Sun May 28 13:09:44 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.servlet;
+package org.apache.cocoon.bootstrap.servlet;
 
 import java.io.IOException;
 

Modified: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/DefaultClassLoader.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/DefaultClassLoader.java?rev=409990&r1=409989&r2=409990&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/DefaultClassLoader.java
(original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/DefaultClassLoader.java
Sun May 28 13:09:44 2006
@@ -23,7 +23,6 @@
 import java.net.URLStreamHandlerFactory;
 import java.util.List;
 
-import org.apache.cocoon.util.WildcardHelper;
 
 /**
  * This class loader reverses the search order for classes.  It checks this classloader

Copied: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardHelper.java
(from r409821, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/util/WildcardHelper.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardHelper.java?p2=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardHelper.java&p1=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/util/WildcardHelper.java&r1=409821&r2=409990&rev=409990&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/util/WildcardHelper.java
(original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardHelper.java
Sun May 28 13:09:44 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.util;
+package org.apache.cocoon.classloader;
 
 import java.util.HashMap;
 



Mime
View raw message