forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: r111698 - in forrest/trunk/main/java/org/apache/forrest: locationmap locationmap/lm sourceexists sourcetype util xni
Date Mon, 13 Dec 2004 10:16:35 GMT
Author: nicolaken
Date: Mon Dec 13 02:16:34 2004
New Revision: 111698

URL: http://svn.apache.org/viewcvs?view=rev&rev=111698
Log:
Move Forrest java code to the org.apache.forrest namespace.
Refactor the pakage names based on functionality.

Things are generally working, please test further, as now the classes are not in the original
Cocoon packages anymore.
Added:
   forrest/trunk/main/java/org/apache/forrest/locationmap/
   forrest/trunk/main/java/org/apache/forrest/locationmap/AbstractWrappingModule.java
      - copied, changed from r111692, forrest/trunk/main/java/org/apache/cocoon/components/modules/input/AbstractWrappingModule.java
   forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java
      - copied, changed from r111692, forrest/trunk/main/java/org/apache/cocoon/components/modules/input/LocationMapModule.java
   forrest/trunk/main/java/org/apache/forrest/locationmap/RegexpLocationMapMatcher.java
      - copied, changed from r111692, forrest/trunk/main/java/org/apache/cocoon/matching/RegexpLocationMapMatcher.java
   forrest/trunk/main/java/org/apache/forrest/locationmap/WildcardLocationMapHintMatcher.java
      - copied, changed from r111692, forrest/trunk/main/java/org/apache/cocoon/matching/WildcardLocationMapHintMatcher.java
   forrest/trunk/main/java/org/apache/forrest/locationmap/WildcardLocationMapMatcher.java
      - copied, changed from r111692, forrest/trunk/main/java/org/apache/cocoon/matching/WildcardLocationMapMatcher.java
   forrest/trunk/main/java/org/apache/forrest/locationmap/lm/
      - copied from r111692, forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/
   forrest/trunk/main/java/org/apache/forrest/sourceexists/
   forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java
      - copied, changed from r111692, forrest/trunk/main/java/org/apache/cocoon/selection/SourceExistsSelector.java
   forrest/trunk/main/java/org/apache/forrest/sourcetype/
      - copied from r111692, forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/
   forrest/trunk/main/java/org/apache/forrest/util/
   forrest/trunk/main/java/org/apache/forrest/util/IdGeneratorTransformer.java
      - copied, changed from r111692, forrest/trunk/main/java/org/apache/cocoon/transformation/IdGeneratorTransformer.java
   forrest/trunk/main/java/org/apache/forrest/util/XPathTransformer.java
      - copied, changed from r111692, forrest/trunk/main/java/org/apache/cocoon/transformation/XPathTransformer.java
   forrest/trunk/main/java/org/apache/forrest/xni/
   forrest/trunk/main/java/org/apache/forrest/xni/XNIConfigurableFileGenerator.java
      - copied, changed from r111692, forrest/trunk/main/java/org/apache/cocoon/generation/XNIConfigurableFileGenerator.java
Modified:
   forrest/trunk/main/java/org/apache/forrest/locationmap/lm/AbstractNode.java
   forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java
   forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationNode.java
   forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocatorNode.java
   forrest/trunk/main/java/org/apache/forrest/locationmap/lm/MatchNode.java
   forrest/trunk/main/java/org/apache/forrest/locationmap/lm/SelectNode.java
   forrest/trunk/main/java/org/apache/forrest/sourcetype/DocDeclRule.java
   forrest/trunk/main/java/org/apache/forrest/sourcetype/DocumentElementRule.java
   forrest/trunk/main/java/org/apache/forrest/sourcetype/ProcessingInstructionRule.java
   forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceInfo.java
   forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceType.java
   forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceTypeAction.java
   forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceTypeRule.java
   forrest/trunk/main/java/org/apache/forrest/sourcetype/XmlSchemaRule.java

Copied: forrest/trunk/main/java/org/apache/forrest/locationmap/AbstractWrappingModule.java
(from r111692, forrest/trunk/main/java/org/apache/cocoon/components/modules/input/AbstractWrappingModule.java)
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/AbstractWrappingModule.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/AbstractWrappingModule.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/locationmap/AbstractWrappingModule.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/components/modules/input/AbstractWrappingModule.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/AbstractWrappingModule.java	Mon
Dec 13 02:16:34 2004
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.cocoon.components.modules.input;
+package org.apache.forrest.locationmap;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -28,6 +28,8 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
+
+import org.apache.cocoon.components.modules.input.InputModule;
 
 public abstract class AbstractWrappingModule extends AbstractLogEnabled
     implements InputModule, Configurable, Serviceable, Disposable {

Copied: forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java (from
r111692, forrest/trunk/main/java/org/apache/cocoon/components/modules/input/LocationMapModule.java)
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/LocationMapModule.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/components/modules/input/LocationMapModule.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java	Mon Dec
13 02:16:34 2004
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.modules.input;
+package org.apache.forrest.locationmap;
 
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.apache.forrest.locationmap.lm.LocationMap;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
@@ -30,7 +31,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.modules.input.lm.LocationMap;
+import org.apache.cocoon.components.modules.input.InputModule;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
 import org.apache.excalibur.source.SourceValidity;

Copied: forrest/trunk/main/java/org/apache/forrest/locationmap/RegexpLocationMapMatcher.java
(from r111692, forrest/trunk/main/java/org/apache/cocoon/matching/RegexpLocationMapMatcher.java)
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/RegexpLocationMapMatcher.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/matching/RegexpLocationMapMatcher.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/locationmap/RegexpLocationMapMatcher.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/matching/RegexpLocationMapMatcher.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/RegexpLocationMapMatcher.java	Mon
Dec 13 02:16:34 2004
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.matching;
+package org.apache.forrest.locationmap;
+
 import java.util.Map;
 
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.modules.input.lm.LocationMap;
+import org.apache.forrest.locationmap.lm.LocationMap;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.matching.AbstractRegexpMatcher;
 

Copied: forrest/trunk/main/java/org/apache/forrest/locationmap/WildcardLocationMapHintMatcher.java
(from r111692, forrest/trunk/main/java/org/apache/cocoon/matching/WildcardLocationMapHintMatcher.java)
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/WildcardLocationMapHintMatcher.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/matching/WildcardLocationMapHintMatcher.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/locationmap/WildcardLocationMapHintMatcher.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/matching/WildcardLocationMapHintMatcher.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/WildcardLocationMapHintMatcher.java
Mon Dec 13 02:16:34 2004
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.matching;
+package org.apache.forrest.locationmap;
 
 import java.util.Map;
 
 import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.components.modules.input.lm.LocationMap;
+import org.apache.forrest.locationmap.lm.LocationMap;
+import org.apache.cocoon.matching.AbstractWildcardMatcher;
 
 /**
  * Match a LocationMap hint - the part after the module name (module_name:<b>hint</b>)
- 

Copied: forrest/trunk/main/java/org/apache/forrest/locationmap/WildcardLocationMapMatcher.java
(from r111692, forrest/trunk/main/java/org/apache/cocoon/matching/WildcardLocationMapMatcher.java)
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/WildcardLocationMapMatcher.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/matching/WildcardLocationMapMatcher.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/locationmap/WildcardLocationMapMatcher.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/matching/WildcardLocationMapMatcher.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/WildcardLocationMapMatcher.java
Mon Dec 13 02:16:34 2004
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.matching;
+package org.apache.forrest.locationmap;
+
 import java.util.Map;
 
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.modules.input.lm.LocationMap;
+import org.apache.forrest.locationmap.lm.LocationMap;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.matching.AbstractWildcardMatcher;
 

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/AbstractNode.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/AbstractNode.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/AbstractNode.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/locationmap/lm/AbstractNode.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/AbstractNode.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/AbstractNode.java	Mon Dec 13
02:16:34 2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.modules.input.lm;
+package org.apache.forrest.locationmap.lm;
 
 import java.util.HashMap;
 import java.util.Iterator;

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocationMap.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocationMap.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java	Mon Dec 13
02:16:34 2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.modules.input.lm;
+package org.apache.forrest.locationmap.lm;
 
 import java.util.HashMap;
 import java.util.Iterator;

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationNode.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationNode.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocationNode.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationNode.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocationNode.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationNode.java	Mon Dec 13
02:16:34 2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.modules.input.lm;
+package org.apache.forrest.locationmap.lm;
 
 import java.util.Map;
 

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocatorNode.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocatorNode.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocatorNode.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocatorNode.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocatorNode.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocatorNode.java	Mon Dec 13
02:16:34 2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.modules.input.lm;
+package org.apache.forrest.locationmap.lm;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/MatchNode.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/MatchNode.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/MatchNode.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/locationmap/lm/MatchNode.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/MatchNode.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/MatchNode.java	Mon Dec 13 02:16:34
2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.modules.input.lm;
+package org.apache.forrest.locationmap.lm;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/SelectNode.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/SelectNode.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/SelectNode.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/locationmap/lm/SelectNode.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/SelectNode.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/SelectNode.java	Mon Dec 13 02:16:34
2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.modules.input.lm;
+package org.apache.forrest.locationmap.lm;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java
(from r111692, forrest/trunk/main/java/org/apache/cocoon/selection/SourceExistsSelector.java)
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/selection/SourceExistsSelector.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/selection/SourceExistsSelector.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java	Mon
Dec 13 02:16:34 2004
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.selection;
+package org.apache.forrest.sourceexists;
 
 import java.net.MalformedURLException;
 import java.util.Map;
 
 import java.io.IOException;
+
+import org.apache.cocoon.selection.Selector;
 
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;

Modified: forrest/trunk/main/java/org/apache/forrest/sourcetype/DocDeclRule.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/sourcetype/DocDeclRule.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/DocDeclRule.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/sourcetype/DocDeclRule.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/DocDeclRule.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/sourcetype/DocDeclRule.java	Mon Dec 13 02:16:34
2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.acting.sourcetype;
+package org.apache.forrest.sourcetype;
 
 import org.apache.avalon.framework.configuration.*;
 

Modified: forrest/trunk/main/java/org/apache/forrest/sourcetype/DocumentElementRule.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/sourcetype/DocumentElementRule.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/DocumentElementRule.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/sourcetype/DocumentElementRule.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/DocumentElementRule.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/sourcetype/DocumentElementRule.java	Mon Dec
13 02:16:34 2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.acting.sourcetype;
+package org.apache.forrest.sourcetype;
 
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;

Modified: forrest/trunk/main/java/org/apache/forrest/sourcetype/ProcessingInstructionRule.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/sourcetype/ProcessingInstructionRule.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/ProcessingInstructionRule.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/sourcetype/ProcessingInstructionRule.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/ProcessingInstructionRule.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/sourcetype/ProcessingInstructionRule.java	Mon
Dec 13 02:16:34 2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.acting.sourcetype;
+package org.apache.forrest.sourcetype;
 
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;

Modified: forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceInfo.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceInfo.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/SourceInfo.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceInfo.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/SourceInfo.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceInfo.java	Mon Dec 13 02:16:34
2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.acting.sourcetype;
+package org.apache.forrest.sourcetype;
 
 import java.util.HashMap;
 

Modified: forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceType.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceType.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/SourceType.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceType.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/SourceType.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceType.java	Mon Dec 13 02:16:34
2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.acting.sourcetype;
+package org.apache.forrest.sourcetype;
 
 import org.apache.avalon.framework.configuration.*;
 

Modified: forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceTypeAction.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceTypeAction.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/SourceTypeAction.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceTypeAction.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/SourceTypeAction.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceTypeAction.java	Mon Dec 13
02:16:34 2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.acting.sourcetype;
+package org.apache.forrest.sourcetype;
 
 import org.cyberneko.pull.XMLPullParser;
 import org.cyberneko.pull.XMLEvent;

Modified: forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceTypeRule.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceTypeRule.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/SourceTypeRule.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceTypeRule.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/SourceTypeRule.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/sourcetype/SourceTypeRule.java	Mon Dec 13 02:16:34
2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.acting.sourcetype;
+package org.apache.forrest.sourcetype;
 
 import org.apache.avalon.framework.configuration.Configurable;
 

Modified: forrest/trunk/main/java/org/apache/forrest/sourcetype/XmlSchemaRule.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/sourcetype/XmlSchemaRule.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/XmlSchemaRule.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/sourcetype/XmlSchemaRule.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/acting/sourcetype/XmlSchemaRule.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/sourcetype/XmlSchemaRule.java	Mon Dec 13 02:16:34
2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.acting.sourcetype;
+package org.apache.forrest.sourcetype;
 
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;

Copied: forrest/trunk/main/java/org/apache/forrest/util/IdGeneratorTransformer.java (from
r111692, forrest/trunk/main/java/org/apache/cocoon/transformation/IdGeneratorTransformer.java)
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/util/IdGeneratorTransformer.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/transformation/IdGeneratorTransformer.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/util/IdGeneratorTransformer.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/transformation/IdGeneratorTransformer.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/util/IdGeneratorTransformer.java	Mon Dec 13
02:16:34 2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.transformation;
+package org.apache.forrest.util;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -27,6 +27,7 @@
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.ServiceException;
+import org.apache.cocoon.transformation.AbstractDOMTransformer;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
 import org.apache.cocoon.environment.SourceResolver;

Copied: forrest/trunk/main/java/org/apache/forrest/util/XPathTransformer.java (from r111692,
forrest/trunk/main/java/org/apache/cocoon/transformation/XPathTransformer.java)
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/util/XPathTransformer.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/transformation/XPathTransformer.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/util/XPathTransformer.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/transformation/XPathTransformer.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/util/XPathTransformer.java	Mon Dec 13 02:16:34
2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.transformation;
+package org.apache.forrest.util;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -24,6 +24,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.transformation.AbstractDOMTransformer;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.util.HashUtil;

Copied: forrest/trunk/main/java/org/apache/forrest/xni/XNIConfigurableFileGenerator.java (from
r111692, forrest/trunk/main/java/org/apache/cocoon/generation/XNIConfigurableFileGenerator.java)
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/xni/XNIConfigurableFileGenerator.java?view=diff&rev=111698&p1=forrest/trunk/main/java/org/apache/cocoon/generation/XNIConfigurableFileGenerator.java&r1=111692&p2=forrest/trunk/main/java/org/apache/forrest/xni/XNIConfigurableFileGenerator.java&r2=111698
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/generation/XNIConfigurableFileGenerator.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/xni/XNIConfigurableFileGenerator.java	Mon Dec
13 02:16:34 2004
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.generation;
+package org.apache.forrest.xni;
 
+import org.apache.cocoon.generation.ServiceableGenerator;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.ResourceNotFoundException;
 import org.apache.cocoon.components.source.SourceUtil;

Mime
View raw message