wink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r1516972 - in /wink/2.x/trunk: wink-cdi-server/src/main/java/org/apache/wink/cdi/ wink-cdi-server/src/main/java/org/apache/wink/cdi/server/ wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/ wink-cdi-server/src/main/java/org...
Date Fri, 23 Aug 2013 18:35:43 GMT
Author: gpetracek
Date: Fri Aug 23 18:35:42 2013
New Revision: 1516972

URL: http://svn.apache.org/r1516972
Log:
WINK-409 changed package names and cleanup


Added:
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/
      - copied from r1516967, wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/jcdi/server/
    wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/
    wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/
      - copied from r1516967, wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/jcdi/server/
Removed:
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/jcdi/
    wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/internal/
    wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/jcdi/server/
Modified:
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/CdiAwareObjectFactory.java
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/CdiLifecycleManager.java
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/DefaultBeanManagerResolver.java
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/JAXRSJCDICustomInjectionTarget.java
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/OptionalScopeAutoUpgradeExtension.java
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/WinkAnnotatedTypeWrapper.java
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/WinkCdiExtension.java
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/literal/ApplicationScopedLiteral.java
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/literal/RequestScopedLiteral.java
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/util/CdiUtils.java
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/util/ClassUtils.java
    wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/spi/BeanManagerResolver.java
    wink/2.x/trunk/wink-cdi-server/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
    wink/2.x/trunk/wink-cdi-server/src/main/resources/META-INF/services/org.apache.wink.common.spi.lifecycle.LifecycleManager
    wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/WinkCdiTest.java
    wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/controller/TestController.java
    wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/service/SimpleTestService.java
    wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/util/ArchiveUtils.java
    wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/util/ShrinkWrapArchiveUtil.java
    wink/2.x/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties

Modified: wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/CdiAwareObjectFactory.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/CdiAwareObjectFactory.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/CdiAwareObjectFactory.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/CdiAwareObjectFactory.java
Fri Aug 23 18:35:42 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.internal;
+package org.apache.wink.cdi.server.internal;
 
 import org.apache.wink.common.RuntimeContext;
 import org.apache.wink.common.spi.lifecycle.ObjectFactory;

Modified: wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/CdiLifecycleManager.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/CdiLifecycleManager.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/CdiLifecycleManager.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/CdiLifecycleManager.java
Fri Aug 23 18:35:42 2013
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.internal;
+package org.apache.wink.cdi.server.internal;
 
 import org.apache.wink.common.internal.i18n.Messages;
 import org.apache.wink.common.spi.lifecycle.LifecycleManager;
 import org.apache.wink.common.spi.lifecycle.ObjectCreationException;
 import org.apache.wink.common.spi.lifecycle.ObjectFactory;
 import org.apache.wink.common.utils.SpiUtils;
-import org.apache.wink.jcdi.server.internal.util.CdiUtils;
-import org.apache.wink.jcdi.server.spi.BeanManagerResolver;
+import org.apache.wink.cdi.server.internal.util.CdiUtils;
+import org.apache.wink.cdi.server.spi.BeanManagerResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/DefaultBeanManagerResolver.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/DefaultBeanManagerResolver.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/DefaultBeanManagerResolver.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/DefaultBeanManagerResolver.java
Fri Aug 23 18:35:42 2013
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.internal;
+package org.apache.wink.cdi.server.internal;
 
-import org.apache.wink.jcdi.server.internal.util.ClassUtils;
-import org.apache.wink.jcdi.server.spi.BeanManagerResolver;
+import org.apache.wink.cdi.server.internal.util.ClassUtils;
+import org.apache.wink.cdi.server.spi.BeanManagerResolver;
 
 import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;

Modified: wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/JAXRSJCDICustomInjectionTarget.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/JAXRSJCDICustomInjectionTarget.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/JAXRSJCDICustomInjectionTarget.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/JAXRSJCDICustomInjectionTarget.java
Fri Aug 23 18:35:42 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.internal.extension;
+package org.apache.wink.cdi.server.internal.extension;
 
 import org.apache.wink.common.internal.i18n.Messages;
 import org.apache.wink.common.internal.lifecycle.CreationUtils;

Modified: wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/OptionalScopeAutoUpgradeExtension.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/OptionalScopeAutoUpgradeExtension.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/OptionalScopeAutoUpgradeExtension.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/OptionalScopeAutoUpgradeExtension.java
Fri Aug 23 18:35:42 2013
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.internal.extension;
+package org.apache.wink.cdi.server.internal.extension;
 
 import org.apache.wink.common.internal.registry.metadata.ApplicationMetadataCollector;
 import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
 import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
-import org.apache.wink.jcdi.server.internal.literal.ApplicationScopedLiteral;
-import org.apache.wink.jcdi.server.internal.literal.RequestScopedLiteral;
-import org.apache.wink.jcdi.server.internal.util.CdiUtils;
+import org.apache.wink.cdi.server.internal.literal.ApplicationScopedLiteral;
+import org.apache.wink.cdi.server.internal.literal.RequestScopedLiteral;
+import org.apache.wink.cdi.server.internal.util.CdiUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/WinkAnnotatedTypeWrapper.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/WinkAnnotatedTypeWrapper.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/WinkAnnotatedTypeWrapper.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/WinkAnnotatedTypeWrapper.java
Fri Aug 23 18:35:42 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.internal.extension;
+package org.apache.wink.cdi.server.internal.extension;
 
 import javax.enterprise.inject.spi.AnnotatedConstructor;
 import javax.enterprise.inject.spi.AnnotatedField;

Modified: wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/WinkCdiExtension.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/WinkCdiExtension.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/WinkCdiExtension.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/extension/WinkCdiExtension.java
Fri Aug 23 18:35:42 2013
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.internal.extension;
+package org.apache.wink.cdi.server.internal.extension;
 
 import org.apache.wink.common.internal.registry.metadata.ApplicationMetadataCollector;
 import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
 import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
-import org.apache.wink.jcdi.server.internal.DefaultBeanManagerResolver;
-import org.apache.wink.jcdi.server.internal.util.CdiUtils;
+import org.apache.wink.cdi.server.internal.DefaultBeanManagerResolver;
+import org.apache.wink.cdi.server.internal.util.CdiUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/literal/ApplicationScopedLiteral.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/literal/ApplicationScopedLiteral.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/literal/ApplicationScopedLiteral.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/literal/ApplicationScopedLiteral.java
Fri Aug 23 18:35:42 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.internal.literal;
+package org.apache.wink.cdi.server.internal.literal;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.util.AnnotationLiteral;

Modified: wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/literal/RequestScopedLiteral.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/literal/RequestScopedLiteral.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/literal/RequestScopedLiteral.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/literal/RequestScopedLiteral.java
Fri Aug 23 18:35:42 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.internal.literal;
+package org.apache.wink.cdi.server.internal.literal;
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.util.AnnotationLiteral;

Modified: wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/util/CdiUtils.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/util/CdiUtils.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/util/CdiUtils.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/util/CdiUtils.java
Fri Aug 23 18:35:42 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.internal.util;
+package org.apache.wink.cdi.server.internal.util;
 
 import javax.enterprise.inject.AmbiguousResolutionException;
 import javax.enterprise.inject.Specializes;

Modified: wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/util/ClassUtils.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/util/ClassUtils.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/internal/util/ClassUtils.java
Fri Aug 23 18:35:42 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.internal.util;
+package org.apache.wink.cdi.server.internal.util;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;

Modified: wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/spi/BeanManagerResolver.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/spi/BeanManagerResolver.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/spi/BeanManagerResolver.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/java/org/apache/wink/cdi/server/spi/BeanManagerResolver.java
Fri Aug 23 18:35:42 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.spi;
+package org.apache.wink.cdi.server.spi;
 
 import javax.enterprise.inject.spi.BeanManager;
 

Modified: wink/2.x/trunk/wink-cdi-server/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=1516972&r1=1516971&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
Fri Aug 23 18:35:42 2013
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-org.apache.wink.jcdi.server.internal.extension.WinkCdiExtension
-#org.apache.wink.jcdi.server.internal.extension.OptionalScopeAutoUpgradeExtension
+org.apache.wink.cdi.server.internal.extension.WinkCdiExtension
+#org.apache.wink.cdi.server.internal.extension.OptionalScopeAutoUpgradeExtension

Modified: wink/2.x/trunk/wink-cdi-server/src/main/resources/META-INF/services/org.apache.wink.common.spi.lifecycle.LifecycleManager
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/main/resources/META-INF/services/org.apache.wink.common.spi.lifecycle.LifecycleManager?rev=1516972&r1=1516971&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/main/resources/META-INF/services/org.apache.wink.common.spi.lifecycle.LifecycleManager
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/main/resources/META-INF/services/org.apache.wink.common.spi.lifecycle.LifecycleManager
Fri Aug 23 18:35:42 2013
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-org.apache.wink.jcdi.server.internal.CdiLifecycleManager
+org.apache.wink.cdi.server.internal.CdiLifecycleManager

Modified: wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/WinkCdiTest.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/WinkCdiTest.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/WinkCdiTest.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/WinkCdiTest.java
Fri Aug 23 18:35:42 2013
@@ -16,16 +16,16 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.wink.jcdi.server.test;
+package org.apache.wink.cdi.server.test;
 
 
 import org.apache.wink.client.ClientConfig;
 import org.apache.wink.client.Resource;
 import org.apache.wink.client.RestClient;
 import org.apache.wink.common.model.synd.SyndFeed;
-import org.apache.wink.jcdi.server.test.controller.TestController;
-import org.apache.wink.jcdi.server.test.service.SimpleTestService;
-import org.apache.wink.jcdi.server.test.util.ArchiveUtils;
+import org.apache.wink.cdi.server.test.controller.TestController;
+import org.apache.wink.cdi.server.test.service.SimpleTestService;
+import org.apache.wink.cdi.server.test.util.ArchiveUtils;
 import org.apache.wink.server.internal.servlet.RestServlet;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;

Modified: wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/controller/TestController.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/controller/TestController.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/controller/TestController.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/controller/TestController.java
Fri Aug 23 18:35:42 2013
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.test.controller;
+package org.apache.wink.cdi.server.test.controller;
 
 import org.apache.wink.common.model.synd.SyndEntry;
 import org.apache.wink.common.model.synd.SyndText;
-import org.apache.wink.jcdi.server.test.service.SimpleTestService;
+import org.apache.wink.cdi.server.test.service.SimpleTestService;
 
 import javax.inject.Inject;
 import javax.ws.rs.GET;

Modified: wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/service/SimpleTestService.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/service/SimpleTestService.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/service/SimpleTestService.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/service/SimpleTestService.java
Fri Aug 23 18:35:42 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package org.apache.wink.jcdi.server.test.service;
+package org.apache.wink.cdi.server.test.service;
 
 import javax.enterprise.context.ApplicationScoped;
 

Modified: wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/util/ArchiveUtils.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/util/ArchiveUtils.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/util/ArchiveUtils.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/util/ArchiveUtils.java
Fri Aug 23 18:35:42 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.test.util;
+package org.apache.wink.cdi.server.test.util;
 
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 
@@ -27,8 +27,8 @@ public abstract class ArchiveUtils {
     }
 
     public static JavaArchive[] getWinkCdiServerArchive() {
-        String[] excludedFiles = new String[]{"org.apache.wink.jcdi.server.test"};
-        return ShrinkWrapArchiveUtil.getArchives("META-INF/services/javax.enterprise.inject.spi.Extension",
new String[]{"org.apache.wink.jcdi.server"}, excludedFiles, "wink-cdi");
+        String[] excludedFiles = new String[]{"org.apache.wink.cdi.server.test"};
+        return ShrinkWrapArchiveUtil.getArchives("META-INF/services/javax.enterprise.inject.spi.Extension",
new String[]{"org.apache.wink.cdi.server"}, excludedFiles, "wink-cdi");
     }
 
     public static JavaArchive[] getWinkCommonArchive() {

Modified: wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/util/ShrinkWrapArchiveUtil.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/util/ShrinkWrapArchiveUtil.java?rev=1516972&r1=1516967&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/util/ShrinkWrapArchiveUtil.java
(original)
+++ wink/2.x/trunk/wink-cdi-server/src/test/java/org/apache/wink/cdi/server/test/util/ShrinkWrapArchiveUtil.java
Fri Aug 23 18:35:42 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.wink.jcdi.server.test.util;
+package org.apache.wink.cdi.server.test.util;
 
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;

Modified: wink/2.x/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties?rev=1516972&r1=1516971&r2=1516972&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties
(original)
+++ wink/2.x/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties
Fri Aug 23 18:35:42 2013
@@ -151,7 +151,7 @@ parameterHttpIsEmptyOrNotInitialized=The
 uriInfoInvalidURI=A URI was specified with syntax that is not valid.  Verify that the URI
is valid.
 methodCallOutsideScopeOfRequestContext=A method call was made outside the scope of a request
context.  Verify that the method is called within the context of a JAX-RS request.
 
-# JCDI
+# CDI
 #jcdiSingletonObjectFactoryCannotInstantiateInstance=Cannot create an instance of the JCDI
managed bean class {0}.  Verify that the bean is a singleton or is annotated with @javax.enterprise.context.ApplicationScoped.

 
 # others
@@ -219,7 +219,7 @@ entityRefsNotSupportedSunJDK5=Entity ref
 saxParseException=The system cannot parse the XML content into a {0} instance.  Verify that
the XML content is valid.
 saxParserConfigurationException=The system cannot configure the SAX parser with the given
configuration parameter.
 badXMLReaderInitialStart=The XMLStreamReader instance has already been partially processed.
-exceptionDuringInjection=Exception encountered during JCDI injection
+exceptionDuringInjection=Exception encountered during CDI injection
 #couldNotFindBeanManager=Could not find BeanManager.
 processingRequestTo=Processing {0} request to {1}, source content type is {2}, acceptable
media types include {3}
 registeredResources=Registered JAX-RS resources: {0}



Mime
View raw message