cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r490773 - in /cocoon/trunk/core: cocoon-core/ cocoon-core/src/main/java/org/apache/cocoon/acting/ cocoon-core/src/main/java/org/apache/cocoon/components/flow/ cocoon-core/src/main/java/org/apache/cocoon/components/modules/ cocoon-core/src/m...
Date Thu, 28 Dec 2006 19:27:59 GMT
Author: danielf
Date: Thu Dec 28 11:27:50 2006
New Revision: 490773

URL: http://svn.apache.org/viewvc?view=rev&rev=490773
Log:
* Moved actions, modules, some sources, matchers, selectors and the StatusGenerator to the cocoon-sitemap-components module.
* Moved various abstract and helper classes for the above kind of components and the components.flow package to the cocoon-sitemap-impl module.
* Moved the util.jxpath package to the cocoon-sitemap-impl package which probably isn't the right place for it, but I didn't want to make cocoon-util dependent on jxpath, as that would mean that about everything would depend on jxpath.
* Moved the rest of the util package to cocoon-util.
There are still classes left in cocoon-core, where more thinking is needed about where to put them. Tests and configuration files are not moved yet.

Added:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/NamespacesTable.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/NamespacesTable.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/dom/DocumentWrapper.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/dom/DocumentWrapper.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/
      - copied from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/ClearCacheAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ClearCacheAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/FormValidatorAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/FormValidatorAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/HelloAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/HelloAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/HttpCacheAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/HttpCacheAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/HttpHeaderAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/HttpHeaderAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/InputModuleAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/InputModuleAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/PropagatorAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/PropagatorAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/RequestParamAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/RequestParamAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/RequestParameterExistsAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/RequestParameterExistsAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/ResourceExistsAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ResourceExistsAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionInvalidatorAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SessionInvalidatorAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionIsValidAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SessionIsValidAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionPropagatorAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SessionPropagatorAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionStateAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SessionStateAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionValidatorAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SessionValidatorAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SetterAction.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SetterAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/
      - copied from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/BaseLinkModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/BaseLinkModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/ChainMetaModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ChainMetaModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/ContextPathModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ContextPathModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/CookieModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/CookieModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/DateInputModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/DateInputModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/DateMetaInputModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/DateMetaInputModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/DefaultsModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/DefaultsModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/DigestMetaModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/DigestMetaModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/EnvironmentAttributeModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/EnvironmentAttributeModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/FlowAttributeModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/FlowAttributeModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/FlowContinuationModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/FlowContinuationModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/HeaderAttributeModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/HeaderAttributeModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/LocateResource.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/LocateResource.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/MapMetaModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/MapMetaModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/NamingInputModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/NamingInputModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/NullInputModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/NullInputModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/RandomNumberModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/RandomNumberModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/RawRequestParameterModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/RawRequestParameterModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/RealPathModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/RealPathModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/RequestAttributeModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/RequestAttributeModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/RequestModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/RequestModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/RequestParameterModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/RequestParameterModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/RequestScopedAttributeModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/RequestScopedAttributeModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/RequestURIModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/RequestURIModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SelectMetaInputModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/SelectMetaInputModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SessionAttributeModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/SessionAttributeModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SessionModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/SessionModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SettingsInputModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/SettingsInputModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SimpleMappingMetaModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/SimpleMappingMetaModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/StringConstantModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/StringConstantModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SystemPropertyModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/SystemPropertyModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/URLDecodeModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/URLDecodeModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/URLEncodeModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/URLEncodeModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/XMLFileModule.java
      - copied, changed from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/XMLFileModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/XMLMetaModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/XMLMetaModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/output/
      - copied from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java
      - copied, changed from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StatusGenerator.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/CookieMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/CookieMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/HeaderMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/HeaderMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/MountTableMatcher.java
      - copied, changed from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/MountTableMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/ParameterMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/ParameterMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/RegexpHeaderMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpHeaderMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/RegexpHostMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpHostMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/RegexpParameterMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpParameterMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/RegexpRequestAttributeMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpRequestAttributeMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/RegexpRequestParameterMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpRequestParameterMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/RegexpSessionAttributeMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpSessionAttributeMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/RegexpURIMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpURIMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/RequestAttributeMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RequestAttributeMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/RequestParameterMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RequestParameterMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/SessionAttributeMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/SessionAttributeMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/WildcardHeaderMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardHeaderMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/WildcardHostMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardHostMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/WildcardParameterMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardParameterMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/WildcardRequestAttributeMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardRequestAttributeMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/WildcardRequestParameterMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardRequestParameterMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/WildcardSessionAttributeMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardSessionAttributeMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/WildcardURIMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardURIMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/modular/
      - copied from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/modular/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/modular/CachingRegexpMatcher.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/modular/CachingRegexpMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/modular/CachingWildcardMatcher.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/modular/CachingWildcardMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/modular/WildcardMatcher.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/modular/WildcardMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/
      - copied from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/BrowserSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/BrowserSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/CookieSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/CookieSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/ExceptionSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/ExceptionSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/HeaderSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/HeaderSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/HostSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/HostSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/ParameterSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/ParameterSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/RegexpHeaderSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/RegexpHeaderSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/RegexpRequestParameterSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/RegexpRequestParameterSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/RequestAttributeSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/RequestAttributeSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/RequestMethodSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/RequestMethodSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/RequestParameterSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/RequestParameterSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/ResourceExistsSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/ResourceExistsSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/SessionAttributeSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/SessionAttributeSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/SimpleSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/SimpleSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/XPathExceptionSelector.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/XPathExceptionSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/ModuleSource.java
      - copied, changed from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ModuleSource.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/ModuleSourceFactory.java
      - copied, changed from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ModuleSourceFactory.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/SitemapSource.java
      - copied, changed from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/SitemapSource.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/SitemapSourceFactory.java
      - copied, changed from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/XModuleSource.java
      - copied, changed from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/XModuleSource.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/XModuleSourceFactory.java
      - copied, changed from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/AbstractAction.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
      - copied, changed from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/AbstractConfigurableAction.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractConfigurableAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/AbstractMultiAction.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractMultiAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/ConfigurableServiceableAction.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ConfigurableServiceableAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/ConfigurationHelper.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ConfigurationHelper.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/ServiceableAction.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ServiceableAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/ValidatorActionHelper.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ValidatorActionHelper.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/ValidatorActionResult.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ValidatorActionResult.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/
      - copied from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/FlowHelper.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/FlowHelper.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/InvalidContinuationException.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/InvalidContinuationException.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/WebContinuationDataBean.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/WebContinuationDataBean.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/mbean.properties
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/mbean.properties
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/AbstractInputModule.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/AbstractInputModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/AbstractJXPathModule.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/AbstractJXPathModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/InputModuleAttributeException.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/InputModuleAttributeException.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/InputModuleDestructionException.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/InputModuleDestructionException.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/InputModuleException.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/InputModuleException.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/InputModuleHelper.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/InputModuleHelper.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/InputModuleInitializationException.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/InputModuleInitializationException.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/InputModuleNotFoundException.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/InputModuleNotFoundException.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/IteratorHelper.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/IteratorHelper.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/JXPathHelper.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/JXPathHelper.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/JXPathHelperConfiguration.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/JXPathHelperConfiguration.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/ModuleHolder.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ModuleHolder.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/output/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/output/AbstractOutputModule.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/AbstractOutputModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/matching/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/matching/AbstractPreparableMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/AbstractPreparableMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/selection/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/selection/AbstractRegexpSelector.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/AbstractRegexpSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/selection/AbstractSwitchSelector.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/AbstractSwitchSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/selection/NamedPatternsSelector.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/NamedPatternsSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/util/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/util/jxpath/
      - copied from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/jxpath/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/util/jxpath/DOMFactory.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/jxpath/DOMFactory.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/util/jxpath/NamespacesTablePointer.java
      - copied unchanged from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/jxpath/NamespacesTablePointer.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/ConfigurationUtil.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ConfigurationUtil.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/EnumerationFactory.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/EnumerationFactory.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/HashMap.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/HashMap.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/NullOutputStream.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/NullOutputStream.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/PostInputStream.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/PostInputStream.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/ReflectionUtils.java
      - copied unchanged from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ReflectionUtils.java
Removed:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractConfigurableAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractMultiAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ClearCacheAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ConfigurableServiceableAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ConfigurationHelper.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/FormValidatorAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/HelloAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/HttpCacheAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/HttpHeaderAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/InputModuleAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/PropagatorAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/RequestParamAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/RequestParameterExistsAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ResourceExistsAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ServiceableAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SessionInvalidatorAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SessionIsValidAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SessionPropagatorAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SessionStateAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SessionValidatorAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/SetterAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ValidatorActionHelper.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/ValidatorActionResult.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ModuleSource.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ModuleSourceFactory.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/SitemapSource.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/XModuleSource.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StatusGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/AbstractPreparableMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/CookieMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/HeaderMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/MountTableMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/ParameterMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpHeaderMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpHostMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpParameterMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpRequestAttributeMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpRequestParameterMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpSessionAttributeMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RegexpURIMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RequestAttributeMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/RequestParameterMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/SessionAttributeMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardHeaderMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardHostMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardParameterMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardRequestAttributeMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardRequestParameterMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardSessionAttributeMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/WildcardURIMatcher.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/modular/
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/processing/
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/selection/
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ConfigurationUtil.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/EnumerationFactory.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/HashMap.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/NullOutputStream.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/PostInputStream.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ReflectionUtils.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/jxpath/
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/NamespacesTable.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/dom/DocumentWrapper.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/AbstractAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/AbstractConfigurableAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/AbstractMultiAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/ConfigurableServiceableAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/ConfigurationHelper.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/CopySourceAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/LocaleAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/ServiceableAction.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/ValidatorActionHelper.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/ValidatorActionResult.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/AbstractInputModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/AbstractJXPathModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/InputModuleAttributeException.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/InputModuleDestructionException.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/InputModuleException.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/InputModuleHelper.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/InputModuleInitializationException.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/InputModuleNotFoundException.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/IteratorHelper.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/JXPathHelper.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/JXPathHelperConfiguration.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/ModuleHolder.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/output/AbstractOutputModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/AbstractRegexpSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/AbstractSwitchSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/NamedPatternsSelector.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/SwitchSelector.java
Modified:
    cocoon/trunk/core/cocoon-core/pom.xml
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml

Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?view=diff&rev=490773&r1=490772&r2=490773
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Thu Dec 28 11:27:50 2006
@@ -122,12 +122,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-pipeline-impl</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-sitemap-impl</artifactId>
+      <artifactId>cocoon-sitemap-components</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
@@ -189,51 +184,11 @@
       <artifactId>commons-io</artifactId>
       <version>1.2</version>
     </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.2</version>
-    </dependency>
     <!--dependency>
       <groupId>org.apache.commons</groupId> 
       <artifactId>commons-jci-core</artifactId> 
       <version>1.0-SNAPSHOT</version> 
     </dependency-->
-    <dependency>
-      <groupId>commons-jxpath</groupId>
-      <artifactId>commons-jxpath</artifactId>
-      <version>1.2</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>ant-optional</artifactId>
-          <groupId>ant-optional</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-beanutils</artifactId>
-          <groupId>commons-beanutils</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jdom</artifactId>
-          <groupId>jdom</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>servlet</artifactId>
-          <groupId>javax.servlet</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>servletapi</artifactId>
-          <groupId>servletapi</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>xerces</artifactId>
-          <groupId>xerces</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>ant-optional</artifactId>
-          <groupId>ant</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml?view=diff&rev=490773&r1=490772&r2=490773
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml Thu Dec 28 11:27:50 2006
@@ -35,7 +35,12 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-sitemap-api</artifactId>
+      <artifactId>cocoon-sitemap-impl</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-pipeline-components</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>

Copied: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/XMLFileModule.java (from r490772, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/XMLFileModule.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/XMLFileModule.java?view=diff&rev=490773&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/XMLFileModule.java&r1=490772&p2=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/XMLFileModule.java&r2=490773
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/XMLFileModule.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/XMLFileModule.java Thu Dec 28 11:27:50 2006
@@ -23,7 +23,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.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.commons.collections.map.AbstractReferenceMap;
 import org.apache.commons.collections.map.ReferenceMap;
 import org.apache.excalibur.source.Source;
@@ -173,7 +173,7 @@
                     }
                     src = resolver.resolveURI(this.uri);
                     this.validity = src.getValidity();
-                    this.document = SourceUtil.toDOM(src);
+                    this.document = SourceUtil.toDOM(manager, src);
                 } else if (this.reloadable) {
                     if (logger.isDebugEnabled()) {
                         logger.debug("Document cached... checking validity of uri " + this.uri);
@@ -190,7 +190,7 @@
                                 logger.debug("Reloading document... uri " + this.uri);
                             }
                             this.validity = newValidity;
-                            this.document = SourceUtil.toDOM(src);
+                            this.document = SourceUtil.toDOM(manager, src);
 
                             /*
                              * Clear the cache, otherwise reloads won't do much.

Copied: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java (from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StatusGenerator.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java?view=diff&rev=490773&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StatusGenerator.java&r1=490751&p2=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java&r2=490773
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StatusGenerator.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java Thu Dec 28 11:27:50 2006
@@ -31,7 +31,7 @@
 import org.apache.cocoon.ResourceNotFoundException;
 import org.apache.cocoon.components.flow.ContinuationsManager;
 import org.apache.cocoon.components.flow.WebContinuationDataBean;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.configuration.Settings;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.xml.AttributesImpl;

Copied: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/MountTableMatcher.java (from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/MountTableMatcher.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/MountTableMatcher.java?view=diff&rev=490773&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/MountTableMatcher.java&r1=490751&p2=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/MountTableMatcher.java&r2=490773
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/matching/MountTableMatcher.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/MountTableMatcher.java Thu Dec 28 11:27:50 2006
@@ -27,7 +27,7 @@
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
 
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.sitemap.PatternException;

Copied: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/ModuleSource.java (from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ModuleSource.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/ModuleSource.java?view=diff&rev=490773&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ModuleSource.java&r1=490751&p2=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/ModuleSource.java&r2=490773
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ModuleSource.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/ModuleSource.java Thu Dec 28 11:27:50 2006
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.source.impl;
+package org.apache.cocoon.source.impl;
 
 
 import java.io.InputStream;

Copied: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/ModuleSourceFactory.java (from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ModuleSourceFactory.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/ModuleSourceFactory.java?view=diff&rev=490773&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ModuleSourceFactory.java&r1=490751&p2=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/ModuleSourceFactory.java&r2=490773
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ModuleSourceFactory.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/ModuleSourceFactory.java Thu Dec 28 11:27:50 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.cocoon.components.source.impl;
+package org.apache.cocoon.source.impl;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

Copied: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/SitemapSource.java (from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/SitemapSource.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/SitemapSource.java?view=diff&rev=490773&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/SitemapSource.java&r1=490751&p2=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/SitemapSource.java&r2=490773
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/SitemapSource.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/SitemapSource.java Thu Dec 28 11:27:50 2006
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.source.impl;
+package org.apache.cocoon.source.impl;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -29,7 +29,8 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.cocoon.Processor;
 import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.impl.SitemapSourceInfo;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.environment.Environment;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.internal.EnvironmentHelper;

Copied: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/SitemapSourceFactory.java (from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/SitemapSourceFactory.java?view=diff&rev=490773&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java&r1=490751&p2=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/SitemapSourceFactory.java&r2=490773
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/SitemapSourceFactory.java Thu Dec 28 11:27:50 2006
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.source.impl;
+package org.apache.cocoon.source.impl;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

Copied: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/XModuleSource.java (from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/XModuleSource.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/XModuleSource.java?view=diff&rev=490773&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/XModuleSource.java&r1=490751&p2=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/XModuleSource.java&r2=490773
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/XModuleSource.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/XModuleSource.java Thu Dec 28 11:27:50 2006
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.source.impl;
+package org.apache.cocoon.source.impl;
 
 
 import java.io.InputStream;

Copied: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/XModuleSourceFactory.java (from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/XModuleSourceFactory.java?view=diff&rev=490773&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java&r1=490751&p2=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/XModuleSourceFactory.java&r2=490773
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/XModuleSourceFactory.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/source/impl/XModuleSourceFactory.java Thu Dec 28 11:27:50 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.cocoon.components.source.impl;
+package org.apache.cocoon.source.impl;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml?view=diff&rev=490773&r1=490772&r2=490773
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml Thu Dec 28 11:27:50 2006
@@ -51,6 +51,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-thread-api</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-api</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
@@ -75,9 +80,46 @@
           <groupId>avalon-logkit</groupId>
           <artifactId>avalon-logkit</artifactId>
         </exclusion>
+      </exclusions>
+    </dependency>
+    <!-- Commons -->
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-jxpath</groupId>
+      <artifactId>commons-jxpath</artifactId>
+      <version>1.2</version>
+      <exclusions>
         <exclusion>
-          <groupId>org.apache.avalon.logkit</groupId>
-          <artifactId>avalon-logkit</artifactId>
+          <artifactId>ant-optional</artifactId>
+          <groupId>ant-optional</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>commons-beanutils</artifactId>
+          <groupId>commons-beanutils</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jdom</artifactId>
+          <groupId>jdom</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>servlet</artifactId>
+          <groupId>javax.servlet</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>servletapi</artifactId>
+          <groupId>servletapi</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>xerces</artifactId>
+          <groupId>xerces</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>ant-optional</artifactId>
+          <groupId>ant</groupId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -96,6 +138,12 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
       <version>2.0.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>   
     <dependency>
       <groupId>org.springframework</groupId>

Copied: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java (from r490751, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java?view=diff&rev=490773&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java&r1=490751&p2=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java&r2=490773
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java Thu Dec 28 11:27:50 2006
@@ -19,7 +19,7 @@
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.excalibur.source.Source;
 



Mime
View raw message