You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2012/11/30 15:48:10 UTC
svn commit: r1415661 - in /activemq/trunk:
activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/FilteredKahaDBPersistenceAdapter.java
Author: gtully
Date: Fri Nov 30 14:48:08 2012
New Revision: 1415661
URL: http://svn.apache.org/viewvc?rev=1415661&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3894 - remove requirement for destination property enforced by spring - for a default entry there is no need for a destination - fix dependants
Modified:
activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
activemq/trunk/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/FilteredKahaDBPersistenceAdapter.java
Modified: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java?rev=1415661&r1=1415660&r2=1415661&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java (original)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java Fri Nov 30 14:48:08 2012
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.StringTokenizer;
+import javax.annotation.PostConstruct;
import org.apache.activemq.filter.DestinationMapEntry;
/**
@@ -153,8 +154,12 @@ public class AuthorizationEntry extends
return answer;
}
+ /**
+ *
+ * @org.apache.xbean.InitMethod
+ */
+ @PostConstruct
public void afterPropertiesSet() throws Exception {
- super.afterPropertiesSet();
if (adminRoles != null) {
setAdminACLs(parseACLs(adminRoles));
Modified: activemq/trunk/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/FilteredKahaDBPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/FilteredKahaDBPersistenceAdapter.java?rev=1415661&r1=1415660&r2=1415661&view=diff
==============================================================================
--- activemq/trunk/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/FilteredKahaDBPersistenceAdapter.java (original)
+++ activemq/trunk/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/FilteredKahaDBPersistenceAdapter.java Fri Nov 30 14:48:08 2012
@@ -44,11 +44,6 @@ public class FilteredKahaDBPersistenceAd
this.persistenceAdapter = persistenceAdapter;
}
- @Override
- public void afterPropertiesSet() throws Exception {
- // ok to have no destination, we default it
- }
-
public boolean isPerDestination() {
return perDestination;
}