You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ai...@apache.org on 2008/02/28 18:32:14 UTC
svn commit: r632068 [3/3] - in /incubator/qpid/branches/thegreatmerge/qpid:
./ java/broker/ java/broker/etc/ java/broker/src/main/java/
java/broker/src/main/java/org/apache/qpid/server/ack/
java/broker/src/main/java/org/apache/qpid/server/exchange/ jav...
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestUtils.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestUtils.java?rev=632068&r1=632067&r2=632068&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestUtils.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestUtils.java Thu Feb 28 09:31:56 2008
@@ -1,17 +1,22 @@
/*
- * Copyright 2007 Rupert Smith.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
*/
package org.apache.qpid.junit.extensions.util;
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb 28 09:31:56 2008
@@ -2,3 +2,5 @@
*.iml
org.apache.qpid.management.ui.ipr
org.apache.qpid.management.ui.iws
+.classpath
+.project
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/perftests/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb 28 09:31:56 2008
@@ -2,3 +2,5 @@
qpid-perftests.iml
qpid-perftests.ipr
qpid-perftests.iws
+.classpath
+.project
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/systests/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb 28 09:31:56 2008
@@ -2,3 +2,5 @@
qpid-systests.iml
qpid-systests.ipr
qpid-systests.iws
+.classpath
+.project
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/systests/pom.xml?rev=632068&r1=632067&r2=632068&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/systests/pom.xml (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/systests/pom.xml Thu Feb 28 09:31:56 2008
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -62,11 +62,11 @@
</dependency>
<!-- Test Dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.0</version>
- <scope>test</scope>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.0</version>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -82,18 +82,26 @@
<includes>
<include>**/*Test.class</include>
</includes>
-
+
<systemProperties>
<property>
<name>example.plugin.target</name>
<value>${basedir}/${topDirectoryLocation}/plugins/target</value>
</property>
+ <property>
+ <name>QPID_EXAMPLE_HOME</name>
+ <value>${basedir}</value>
+ </property>
+ <property>
+ <name>QPID_HOME</name>
+ <value>${basedir}/${topDirectoryLocation}/broker</value>
+ </property>
</systemProperties>
-
+
<excludes>
<exclude>**/testcases/ImmediateMessageTest.class</exclude>
<exclude>**/testcases/MandatoryMessageTest.class</exclude>
- <exclude>**/testcases/RollbackTest.class</exclude>
+ <exclude>**/testcases/RollbackTest.class</exclude>
<exclude>**/testcases/TTLTest.class</exclude>
<exclude>**/testcases/FailoverTest.class</exclude>
</excludes>
@@ -112,23 +120,23 @@
<value>${log4j.configuration}</value>
</property>
</systemproperties>
-
+
<testrunner>org.apache.qpid.junit.extensions.TKTestRunner</testrunner>
-
+
<testrunneroptions>
<option>-X:decorators "org.apache.qpid.test.framework.qpid.InVMBrokerDecorator:org.apache.qpid.test.framework.qpid.AMQPFeatureDecorator"</option>
<!--<option>-d30S</option>-->
<option>-o ${basedir}/target/surefire-reports</option>
<option>--xml</option>
</testrunneroptions>
-
+
<testrunnerproperties>
<property>
<name>notApplicableAssertion</name>
<value>warn</value>
</property>
</testrunnerproperties>
-
+
<commands>
<AMQBrokerManagerMBeanTest>-n AMQBrokerManagerMBeanTest org.apache.qpid.server.AMQBrokerManagerMBeanTest </AMQBrokerManagerMBeanTest>
<TxAckTest>-n TxAckTest org.apache.qpid.server.ack.TxAckTest </TxAckTest>
@@ -153,16 +161,16 @@
<!--<Mandatory-Message-Test>-n Mandatory-Test -s[1] org.apache.qpid.test.testcases.MandatoryMessageTest</Mandatory-Message-Test>-->
<!--<Rollback-Test>-n Rollback-Test -s[1] org.apache.qpid.test.testcases.RollbackTest</Rollback-Test>-->
</commands>
-
+
</configuration>
- <executions>
+ <executions>
<execution>
<id>framework_tests</id>
- <phase>test</phase>
+ <phase>test</phase>
<goals>
<goal>tktest</goal>
- </goals>
+ </goals>
</execution>
</executions>
</plugin>
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java?rev=632068&r1=632067&r2=632068&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java Thu Feb 28 09:31:56 2008
@@ -31,8 +31,8 @@
import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;
import org.apache.qpid.server.security.auth.database.PrincipalDatabaseManager;
import org.apache.qpid.server.security.auth.database.PropertiesPrincipalDatabaseManager;
-import org.apache.qpid.server.security.access.AccessManager;
-import org.apache.qpid.server.security.access.AllowAll;
+import org.apache.qpid.server.security.access.ACLPlugin;
+import org.apache.qpid.server.security.access.plugins.AllowAll;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.TestableMemoryMessageStore;
import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -54,7 +54,7 @@
private ManagedObjectRegistry _managedObjectRegistry;
- private AccessManager _accessManager;
+ private ACLPlugin _accessManager;
private PrincipalDatabaseManager _databaseManager;
@@ -137,9 +137,14 @@
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- public AccessManager getAccessManager()
+ public ACLPlugin getAccessManager()
{
return _accessManager;
+ }
+
+ public void setAccessManager(ACLPlugin newManager)
+ {
+ _accessManager = newManager;
}
public MessageStore getMessageStore()