Author: pier
Date: Sun Nov 7 16:34:19 2004
New Revision: 56884
Added:
cocoon/whiteboard/kernel/sources/webapp/docs/
Modified:
cocoon/whiteboard/kernel/build.xml
cocoon/whiteboard/kernel/sources/blocks/jasper/cocoon.xml
cocoon/whiteboard/kernel/sources/blocks/jasper/src/org/apache/cocoon/components/servlet/jasper/JasperServlet.java
cocoon/whiteboard/kernel/sources/blocks/saxon/cocoon.xml
cocoon/whiteboard/kernel/sources/contracts/jaxp/cocoon.xml
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/AbstractProvider.java
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/BuilderProvider.java
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/JaxpException.java
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/JaxpProvider.java
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/ParserProvider.java
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/TransformerProvider.java
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpBuilderPlugin.java
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpParserPlugin.java
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpPlugin.java
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpTransformerPlugin.java
Log:
Packages renamed
Modified: cocoon/whiteboard/kernel/build.xml
==============================================================================
--- cocoon/whiteboard/kernel/build.xml (original)
+++ cocoon/whiteboard/kernel/build.xml Sun Nov 7 16:34:19 2004
@@ -133,7 +133,10 @@
packages="${package}:${package}.configuration:${package}.startup"/>
<group
title="Runtime"
-
packages="${package}.deployment:${package}.description:${package}.plugins"/>
+ packages="${package}.deployment:${package}.description"/>
+ <group
+ title="Plugins"
+ packages="${package}.plugins:${package}.plugins.*"/>
<link
href="http://java.sun.com/j2se/1.4.2/docs/api/package-list";
packagelistLoc="${tools.dir}/package-list/j2se"
Modified: cocoon/whiteboard/kernel/sources/blocks/jasper/cocoon.xml
==============================================================================
--- cocoon/whiteboard/kernel/sources/blocks/jasper/cocoon.xml (original)
+++ cocoon/whiteboard/kernel/sources/blocks/jasper/cocoon.xml Sun Nov 7
16:34:19 2004
@@ -7,6 +7,6 @@
<implements
contract="http://cocoon.apache.org/kernel/contracts/servlet/2.3"/>
</implementations>
- <provides component="org.apache.cocoon.blocks.jasper.JasperServlet"/>
+ <provides
component="org.apache.cocoon.components.servlet.jasper.JasperServlet"/>
</block>
Modified:
cocoon/whiteboard/kernel/sources/blocks/jasper/src/org/apache/cocoon/components/servlet/jasper/JasperServlet.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/blocks/jasper/src/org/apache/cocoon/components/servlet/jasper/JasperServlet.java
(original)
+++
cocoon/whiteboard/kernel/sources/blocks/jasper/src/org/apache/cocoon/components/servlet/jasper/JasperServlet.java
Sun Nov 7 16:34:19 2004
@@ -10,7 +10,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for
the *
* specific language governing permissions and limitations under the License.
*
*
===============================================================================
*/
-package org.apache.cocoon.blocks.jasper;
+package org.apache.cocoon.components.servlet.jasper;
import java.io.File;
import java.io.IOException;
Modified: cocoon/whiteboard/kernel/sources/blocks/saxon/cocoon.xml
==============================================================================
--- cocoon/whiteboard/kernel/sources/blocks/saxon/cocoon.xml (original)
+++ cocoon/whiteboard/kernel/sources/blocks/saxon/cocoon.xml Sun Nov 7
16:34:19 2004
@@ -11,7 +11,7 @@
<library href="saxonb-8.1.1.jar"/>
</libraries>
- <provides component="org.apache.cocoon.contracts.jaxp.TransformerProvider">
+ <provides
component="org.apache.cocoon.kernel.plugins.jaxp.TransformerProvider">
<set property="className" value="net.sf.saxon.TransformerFactoryImpl"/>
</provides>
Modified: cocoon/whiteboard/kernel/sources/contracts/jaxp/cocoon.xml
==============================================================================
--- cocoon/whiteboard/kernel/sources/contracts/jaxp/cocoon.xml (original)
+++ cocoon/whiteboard/kernel/sources/contracts/jaxp/cocoon.xml Sun Nov 7
16:34:19 2004
@@ -3,6 +3,6 @@
<contract xmlns="http://apache.org/cocoon/kernel/descriptor/1.0";
id="http://cocoon.apache.org/kernel/contracts/jaxp/1.0";>
- <exposes interface="org.apache.cocoon.contracts.jaxp.JaxpProvider"/>
+ <exposes interface="org.apache.cocoon.kernel.plugins.jaxp.JaxpProvider"/>
</contract>
Modified:
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/AbstractProvider.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/AbstractProvider.java
(original)
+++
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/AbstractProvider.java
Sun Nov 7 16:34:19 2004
@@ -10,7 +10,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for
the *
* specific language governing permissions and limitations under the License.
*
*
===============================================================================
*/
-package org.apache.cocoon.contracts.jaxp;
+package org.apache.cocoon.kernel.plugins.jaxp;
/**
* <p>The default base implementation of all instances of [EMAIL PROTECTED]
JaxpProvider}.</p>
Modified:
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/BuilderProvider.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/BuilderProvider.java
(original)
+++
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/BuilderProvider.java
Sun Nov 7 16:34:19 2004
@@ -10,7 +10,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for
the *
* specific language governing permissions and limitations under the License.
*
*
===============================================================================
*/
-package org.apache.cocoon.contracts.jaxp;
+package org.apache.cocoon.kernel.plugins.jaxp;
import javax.xml.parsers.DocumentBuilderFactory;
Modified:
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/JaxpException.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/JaxpException.java
(original)
+++
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/JaxpException.java
Sun Nov 7 16:34:19 2004
@@ -10,7 +10,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for
the *
* specific language governing permissions and limitations under the License.
*
*
===============================================================================
*/
-package org.apache.cocoon.contracts.jaxp;
+package org.apache.cocoon.kernel.plugins.jaxp;
/**
* <p>The [EMAIL PROTECTED] JaxpException} is thrown whenever an error
occurred accessing the
Modified:
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/JaxpProvider.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/JaxpProvider.java
(original)
+++
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/JaxpProvider.java
Sun Nov 7 16:34:19 2004
@@ -10,7 +10,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for
the *
* specific language governing permissions and limitations under the License.
*
*
===============================================================================
*/
-package org.apache.cocoon.contracts.jaxp;
+package org.apache.cocoon.kernel.plugins.jaxp;
/**
* <p>A [EMAIL PROTECTED] JaxpProvider} gives access to the several parts of
the JAXP API.</p>
Modified:
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/ParserProvider.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/ParserProvider.java
(original)
+++
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/ParserProvider.java
Sun Nov 7 16:34:19 2004
@@ -10,7 +10,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for
the *
* specific language governing permissions and limitations under the License.
*
*
===============================================================================
*/
-package org.apache.cocoon.contracts.jaxp;
+package org.apache.cocoon.kernel.plugins.jaxp;
import javax.xml.parsers.SAXParserFactory;
Modified:
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/TransformerProvider.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/TransformerProvider.java
(original)
+++
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/kernel/plugins/jaxp/TransformerProvider.java
Sun Nov 7 16:34:19 2004
@@ -10,7 +10,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for
the *
* specific language governing permissions and limitations under the License.
*
*
===============================================================================
*/
-package org.apache.cocoon.contracts.jaxp;
+package org.apache.cocoon.kernel.plugins.jaxp;
import javax.xml.transform.sax.SAXTransformerFactory;
Modified:
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpBuilderPlugin.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpBuilderPlugin.java
(original)
+++
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpBuilderPlugin.java
Sun Nov 7 16:34:19 2004
@@ -16,7 +16,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.cocoon.contracts.jaxp.JaxpException;
+import org.apache.cocoon.kernel.plugins.jaxp.JaxpException;
/**
* <p>A kernel plugin interoperating with the [EMAIL PROTECTED]
DocumentBuilderFactory}
Modified:
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpParserPlugin.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpParserPlugin.java
(original)
+++
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpParserPlugin.java
Sun Nov 7 16:34:19 2004
@@ -16,7 +16,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.cocoon.contracts.jaxp.JaxpException;
+import org.apache.cocoon.kernel.plugins.jaxp.JaxpException;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
Modified:
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpPlugin.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpPlugin.java
(original)
+++
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpPlugin.java
Sun Nov 7 16:34:19 2004
@@ -17,10 +17,10 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.cocoon.contracts.jaxp.JaxpException;
-import org.apache.cocoon.contracts.jaxp.JaxpProvider;
import org.apache.cocoon.kernel.configuration.Configuration;
import org.apache.cocoon.kernel.deployment.Instance;
+import org.apache.cocoon.kernel.plugins.jaxp.JaxpException;
+import org.apache.cocoon.kernel.plugins.jaxp.JaxpProvider;
/**
* <p>The core plugin for the JAXP family of plugins.</p>
Modified:
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpTransformerPlugin.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpTransformerPlugin.java
(original)
+++
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpTransformerPlugin.java
Sun Nov 7 16:34:19 2004
@@ -22,7 +22,7 @@
import javax.xml.transform.sax.TemplatesHandler;
import javax.xml.transform.sax.TransformerHandler;
-import org.apache.cocoon.contracts.jaxp.JaxpException;
+import org.apache.cocoon.kernel.plugins.jaxp.JaxpException;
import org.xml.sax.XMLFilter;
/**
