svn commit: r1130687 - in /myfaces/extensions/cdi/trunk/alternative-modules: alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/ alternative-configuration-modu...

[gp...@apache.org]

Author: gpetracek
Date: Thu Jun  2 17:46:55 2011
New Revision: 1130687

URL: http://svn.apache.org/viewvc?rev=1130687&view=rev
Log:
EXTCDI-177 cleanup

Added:
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/api/
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/api/AlternativeImplementation.java
      - copied, changed from r1130681, myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/AlternativeImplementation.java
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/AlternativeImplementationExtension.java
      - copied, changed from r1130681, myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/AlternativeImplementationExtension.java
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/ConfiguredClassAggregatable.java
      - copied, changed from r1130681, myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/ConfiguredClassAggregatable.java
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/ConfiguredClassDescriptor.java
      - copied, changed from r1130681, myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/ConfiguredClassDescriptor.java
Removed:
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/AlternativeImplementation.java
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/AlternativeImplementationExtension.java
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/ConfiguredClassAggregatable.java
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/ConfiguredClassDescriptor.java
Modified:
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/AlternativeCodiCoreConfig.java
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeConversationConfig.java
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeWindowContextConfig.java
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/AlternativeJsfModuleConfig.java
    myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension

Modified: myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/AlternativeCodiCoreConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/AlternativeCodiCoreConfig.java?rev=1130687&r1=1130686&r2=1130687&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/AlternativeCodiCoreConfig.java (original)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/config/AlternativeCodiCoreConfig.java Thu Jun  2 17:46:55 2011
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.core.alternative.config;
 
-import org.apache.myfaces.extensions.cdi.alternative.implementation.AlternativeImplementation;
+import org.apache.myfaces.extensions.cdi.alternative.implementation.api.AlternativeImplementation;
 import org.apache.myfaces.extensions.cdi.core.api.config.CodiCoreConfig;
 import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
 import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;

Modified: myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeConversationConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeConversationConfig.java?rev=1130687&r1=1130686&r2=1130687&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeConversationConfig.java (original)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeConversationConfig.java Thu Jun  2 17:46:55 2011
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.core.alternative.scope.conversation.config;
 
-import org.apache.myfaces.extensions.cdi.alternative.implementation.AlternativeImplementation;
+import org.apache.myfaces.extensions.cdi.alternative.implementation.api.AlternativeImplementation;
 import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.config.ConversationConfig;
 import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
 import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;

Modified: myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeWindowContextConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeWindowContextConfig.java?rev=1130687&r1=1130686&r2=1130687&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeWindowContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/core-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/core/alternative/scope/conversation/config/AlternativeWindowContextConfig.java Thu Jun  2 17:46:55 2011
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.core.alternative.scope.conversation.config;
 
-import org.apache.myfaces.extensions.cdi.alternative.implementation.AlternativeImplementation;
+import org.apache.myfaces.extensions.cdi.alternative.implementation.api.AlternativeImplementation;
 import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.config.WindowContextConfig;
 import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
 import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;

Modified: myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/AlternativeJsfModuleConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/AlternativeJsfModuleConfig.java?rev=1130687&r1=1130686&r2=1130687&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/AlternativeJsfModuleConfig.java (original)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-configuration-modules/jsf-alternative-configuration-module/src/main/java/org/apache/myfaces/extensions/cdi/jsf/alternative/config/AlternativeJsfModuleConfig.java Thu Jun  2 17:46:55 2011
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf.alternative.config;
 
-import org.apache.myfaces.extensions.cdi.alternative.implementation.AlternativeImplementation;
+import org.apache.myfaces.extensions.cdi.alternative.implementation.api.AlternativeImplementation;
 import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
 import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
 import org.apache.myfaces.extensions.cdi.jsf.api.config.JsfModuleConfig;

Copied: myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/api/AlternativeImplementation.java (from r1130681, myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/AlternativeImplementation.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/api/AlternativeImplementation.java?p2=myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/api/AlternativeImplementation.java&p1=myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/AlternativeImplementation.java&r1=1130681&r2=1130687&rev=1130687&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/AlternativeImplementation.java (original)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/api/AlternativeImplementation.java Thu Jun  2 17:46:55 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.alternative.implementation;
+package org.apache.myfaces.extensions.cdi.alternative.implementation.api;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

Copied: myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/AlternativeImplementationExtension.java (from r1130681, myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/AlternativeImplementationExtension.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/AlternativeImplementationExtension.java?p2=myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/AlternativeImplementationExtension.java&p1=myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/AlternativeImplementationExtension.java&r1=1130681&r2=1130687&rev=1130687&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/AlternativeImplementationExtension.java (original)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/AlternativeImplementationExtension.java Thu Jun  2 17:46:55 2011
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.alternative.implementation;
+package org.apache.myfaces.extensions.cdi.alternative.implementation.impl;
 
+import org.apache.myfaces.extensions.cdi.alternative.implementation.api.AlternativeImplementation;
 import org.apache.myfaces.extensions.cdi.core.api.config.CodiConfig;
 import org.apache.myfaces.extensions.cdi.core.impl.config.ServiceLoaderResolver;
 import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;

Copied: myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/ConfiguredClassAggregatable.java (from r1130681, myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/ConfiguredClassAggregatable.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/ConfiguredClassAggregatable.java?p2=myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/ConfiguredClassAggregatable.java&p1=myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/ConfiguredClassAggregatable.java&r1=1130681&r2=1130687&rev=1130687&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/ConfiguredClassAggregatable.java (original)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/ConfiguredClassAggregatable.java Thu Jun  2 17:46:55 2011
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.alternative.implementation;
+package org.apache.myfaces.extensions.cdi.alternative.implementation.impl;
 
+import org.apache.myfaces.extensions.cdi.alternative.implementation.api.AlternativeImplementation;
 import org.apache.myfaces.extensions.cdi.core.api.Aggregatable;
 
 import javax.enterprise.inject.Typed;

Copied: myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/ConfiguredClassDescriptor.java (from r1130681, myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/ConfiguredClassDescriptor.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/ConfiguredClassDescriptor.java?p2=myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/ConfiguredClassDescriptor.java&p1=myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/ConfiguredClassDescriptor.java&r1=1130681&r2=1130687&rev=1130687&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/ConfiguredClassDescriptor.java (original)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/java/org/apache/myfaces/extensions/cdi/alternative/implementation/impl/ConfiguredClassDescriptor.java Thu Jun  2 17:46:55 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.alternative.implementation;
+package org.apache.myfaces.extensions.cdi.alternative.implementation.impl;
 
 import org.apache.myfaces.extensions.cdi.core.api.config.ConfiguredValueDescriptor;
 

Modified: myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=1130687&r1=1130686&r2=1130687&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (original)
+++ myfaces/extensions/cdi/trunk/alternative-modules/alternative-implementation-module/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Thu Jun  2 17:46:55 2011
@@ -17,4 +17,4 @@
 # under the License.
 #####################################################################################
 
-org.apache.myfaces.extensions.cdi.alternative.implementation.AlternativeImplementationExtension
\ No newline at end of file
+org.apache.myfaces.extensions.cdi.alternative.implementation.impl.AlternativeImplementationExtension
\ No newline at end of file