You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2011/11/24 09:39:30 UTC
svn commit: r1205751 - in /karaf/trunk: ./
assemblies/features/framework/src/main/filtered-resources/resources/etc/
jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/
Author: gnodet
Date: Thu Nov 24 08:39:29 2011
New Revision: 1205751
URL: http://svn.apache.org/viewvc?rev=1205751&view=rev
Log:
[KARAF-988] Upgrade to blueprint 0.4.1
Removed:
karaf/trunk/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/AbstractPropertyPlaceholder.java
karaf/trunk/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/PlaceholdersUtils.java
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
karaf/trunk/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/EncryptablePropertyPlaceholder.java
karaf/trunk/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/NamespaceHandler.java
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties?rev=1205751&r1=1205750&r2=1205751&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties Thu Nov 24 08:39:29 2011
@@ -107,3 +107,7 @@ obr.repository.url =
#
org.apache.aries.blueprint.synchronous=true
+#
+# Do not weave all any classes by default
+#
+org.apache.aries.proxy.weaving.enabled=
Modified: karaf/trunk/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/EncryptablePropertyPlaceholder.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/EncryptablePropertyPlaceholder.java?rev=1205751&r1=1205750&r2=1205751&view=diff
==============================================================================
--- karaf/trunk/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/EncryptablePropertyPlaceholder.java (original)
+++ karaf/trunk/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/EncryptablePropertyPlaceholder.java Thu Nov 24 08:39:29 2011
@@ -15,6 +15,7 @@
package org.apache.karaf.jaas.jasypt.handler;
import org.jasypt.encryption.StringEncryptor;
+import org.apache.aries.blueprint.ext.AbstractPropertyPlaceholder;
public class EncryptablePropertyPlaceholder extends AbstractPropertyPlaceholder {
Modified: karaf/trunk/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/NamespaceHandler.java?rev=1205751&r1=1205750&r2=1205751&view=diff
==============================================================================
--- karaf/trunk/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/NamespaceHandler.java (original)
+++ karaf/trunk/jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/NamespaceHandler.java Thu Nov 24 08:39:29 2011
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Set;
import org.apache.aries.blueprint.ParserContext;
+import org.apache.aries.blueprint.ext.PlaceholdersUtils;
import org.apache.aries.blueprint.mutable.MutableBeanMetadata;
import org.apache.aries.blueprint.mutable.MutableCollectionMetadata;
import org.apache.aries.blueprint.mutable.MutableRefMetadata;
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1205751&r1=1205750&r2=1205751&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Thu Nov 24 08:39:29 2011
@@ -136,11 +136,11 @@
<felix.eventadmin-plugin.version>1.0.2</felix.eventadmin-plugin.version>
<felix.obr.version>1.0.2</felix.obr.version>
<aries.application.version>0.3</aries.application.version>
- <aries.blueprint.version>0.4</aries.blueprint.version>
+ <aries.blueprint.version>0.4.1-SNAPSHOT</aries.blueprint.version>
<aries.jmx.version>0.3</aries.jmx.version>
<aries.jpa.version>0.3</aries.jpa.version>
<aries.jndi.version>0.3</aries.jndi.version>
- <aries.proxy.version>0.4</aries.proxy.version>
+ <aries.proxy.version>0.4.1-SNAPSHOT</aries.proxy.version>
<aries.transaction.version>0.3</aries.transaction.version>
<aries.util.version>0.4</aries.util.version>
<jansi.version>1.7</jansi.version>