portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r736434 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-profiler: ./ src/test/java/JETSPEED-INF/ src/test/java/JETSPEED-INF/spring/ src/test/java/org/apache/jetspeed/profiler/
Date Wed, 21 Jan 2009 22:07:32 GMT
Author: taylor
Date: Wed Jan 21 14:07:31 2009
New Revision: 736434

URL: http://svn.apache.org/viewvc?rev=736434&view=rev
Log:
pushing along unit tests, now profiler is passing

Added:
    portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/
    portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/
    portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml
  (with props)
Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml?rev=736434&r1=736433&r2=736434&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml Wed Jan 21 14:07:31
2009
@@ -75,6 +75,11 @@
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-sso</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-registry</artifactId>
             <scope>test</scope>
         </dependency>
@@ -159,6 +164,12 @@
                 <directory>src/test/resources</directory>
                 <filtering>true</filtering>
             </testResource>
+            <testResource>
+                <directory>src/test/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </testResource>            
         </testResources>
     </build>
 </project>

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml?rev=736434&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml
(added)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml
Wed Jan 21 14:07:31 2009
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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
+    
+    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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+    
+    <bean id="org.apache.jetspeed.security.spi.JetspeedPrincipalManagerProvider"
+        class="org.apache.jetspeed.security.impl.JetspeedPrincipalManagerProviderImpl">
+        <meta key="j2:cat" value="default,security" />
+        <constructor-arg index="0">
+            <set>
+                <ref bean="org.apache.jetspeed.security.UserManager" />
+                <ref bean="org.apache.jetspeed.security.GroupManager" />
+                <ref bean="org.apache.jetspeed.security.RoleManager" />
+            </set>
+        </constructor-arg>
+    </bean>
+    
+</beans>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java?rev=736434&r1=736433&r2=736434&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java
Wed Jan 21 14:07:31 2009
@@ -559,7 +559,7 @@
     protected String[] getConfigurations()
     {
         return new String[] { "profiler.xml", "transaction.xml", "serializer.xml", "security-providers.xml",
"cache-test.xml", "capabilities.xml", "registry.xml", "search.xml", "jetspeed-spring.xml",
-                "security-managers.xml", "security-spi.xml", "security-spi-atn.xml", "security-atz.xml",
"static-bean-references.xml" };
+                "security-managers.xml", "security-spi.xml", "security-spi-atn.xml", "security-atz.xml",
"static-bean-references.xml", "JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml"
};
     }
 
     protected String getBeanDefinitionFilterCategories()



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message