Author: rmannibucau Date: Wed Oct 9 14:15:51 2013 New Revision: 1530618 URL: http://svn.apache.org/r1530618 Log: DS 0.5 on deltaspike-configproperty
Modified: tomee/tomee/trunk/examples/deltaspike-configproperty/pom.xml tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/Counter.java tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSource.java tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSourceProvider.java Modified: tomee/tomee/trunk/examples/deltaspike-configproperty/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-configproperty/pom.xml?rev=1530618&r1=1530617&r2=1530618&view=diff ============================================================================== --- tomee/tomee/trunk/examples/deltaspike-configproperty/pom.xml (original) +++ tomee/tomee/trunk/examples/deltaspike-configproperty/pom.xml Wed Oct 9 14:15:51 2013 @@ -32,7 +32,7 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> + <artifactId>maven-compiler-plugin</artifactId> <version>3.0</version> <configuration> <source>1.6</source> @@ -58,12 +58,12 @@ <dependency> <groupId>org.apache.deltaspike.core</groupId> <artifactId>deltaspike-core-impl</artifactId> - <version>0.2-incubating</version> + <version>0.5</version> </dependency> <dependency> <groupId>org.apache.deltaspike.core</groupId> <artifactId>deltaspike-core-api</artifactId> - <version>0.2-incubating</version> + <version>0.5</version> </dependency> <dependency> <groupId>junit</groupId> Modified: tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/Counter.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/Counter.java?rev=1530618&r1=1530617&r2=1530618&view=diff ============================================================================== --- tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/Counter.java (original) +++ tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/Counter.java Wed Oct 9 14:15:51 2013 @@ -16,7 +16,7 @@ */ package org.superbiz.deltaspike.config; -import org.apache.deltaspike.core.api.config.annotation.ConfigProperty; +import org.apache.deltaspike.core.api.config.ConfigProperty; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; Modified: tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSource.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSource.java?rev=1530618&r1=1530617&r2=1530618&view=diff ============================================================================== --- tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSource.java (original) +++ tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSource.java Wed Oct 9 14:15:51 2013 @@ -21,6 +21,7 @@ import org.apache.deltaspike.core.util.P import java.io.IOException; import java.net.URL; +import java.util.Collections; import java.util.Enumeration; import java.util.Map; import java.util.Properties; @@ -57,6 +58,11 @@ public class MyConfigSource extends Base } @Override + public Map<String, String> getProperties() { + return Collections.emptyMap(); // not scannable + } + + @Override public String getPropertyValue(String key) { return properties.getProperty(key); } @@ -65,4 +71,9 @@ public class MyConfigSource extends Base public String getConfigName() { return MY_CONF_FILE_NAME; } + + @Override + public boolean isScannable() { + return false; + } } Modified: tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSourceProvider.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSourceProvider.java?rev=1530618&r1=1530617&r2=1530618&view=diff ============================================================================== --- tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSourceProvider.java (original) +++ tomee/tomee/trunk/examples/deltaspike-configproperty/src/main/java/org/superbiz/deltaspike/config/MyConfigSourceProvider.java Wed Oct 9 14:15:51 2013 @@ -23,7 +23,6 @@ import java.util.Arrays; import java.util.List; public class MyConfigSourceProvider implements ConfigSourceProvider { - @Override public List<ConfigSource> getConfigSources() { return Arrays.asList((ConfigSource) new MyConfigSource());