You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2011/07/22 02:38:35 UTC
svn commit: r1149421 - in /incubator/rave/trunk: ./ rave-commons/
rave-commons/src/main/java/org/ rave-commons/src/main/java/org/apache/
rave-commons/src/main/java/org/apache/rave/
rave-commons/src/main/java/org/apache/rave/exception/ rave-commons/src/...
Author: mfranklin
Date: Fri Jul 22 00:38:32 2011
New Revision: 1149421
URL: http://svn.apache.org/viewvc?rev=1149421&view=rev
Log:
Moved common o.a.rave.* packages to rave-commons (Supports RAVE-62)
Added:
incubator/rave/trunk/rave-commons/src/main/java/org/
incubator/rave/trunk/rave-commons/src/main/java/org/apache/
incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/
incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/exception/
- copied from r1149405, incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/exception/
incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/jdbc/
- copied from r1149405, incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/jdbc/
incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/orm/
- copied from r1149405, incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/orm/
incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/util/
- copied from r1149405, incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/util/
incubator/rave/trunk/rave-commons/src/test/java/org/
incubator/rave/trunk/rave-commons/src/test/java/org/apache/
incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/
incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/exception/
- copied from r1149405, incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/exception/
incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/util/
- copied from r1149405, incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/util/
incubator/rave/trunk/rave-commons/src/test/resources/
incubator/rave/trunk/rave-commons/src/test/resources/applicationContext-test.xml
- copied, changed from r1149405, incubator/rave/trunk/rave-portal/src/test/resources/applicationContext-test.xml
incubator/rave/trunk/rave-commons/src/test/resources/portal-test.properties
- copied unchanged from r1149405, incubator/rave/trunk/rave-portal/src/test/resources/portal-test.properties
Removed:
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/exception/
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/jdbc/
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/orm/
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/util/
incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/exception/
incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/util/
incubator/rave/trunk/rave-portal/src/test/resources/applicationContext-test.xml
incubator/rave/trunk/rave-portal/src/test/resources/portal-test.properties
Modified:
incubator/rave/trunk/pom.xml
incubator/rave/trunk/rave-commons/ (props changed)
incubator/rave/trunk/rave-commons/pom.xml
incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/util/OverridablePropertyPlaceholderConfigurerTest.java
Modified: incubator/rave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/pom.xml?rev=1149421&r1=1149420&r2=1149421&view=diff
==============================================================================
--- incubator/rave/trunk/pom.xml (original)
+++ incubator/rave/trunk/pom.xml Fri Jul 22 00:38:32 2011
@@ -124,6 +124,11 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${org.springframework.version}</version>
</dependency>
Propchange: incubator/rave/trunk/rave-commons/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 22 00:38:32 2011
@@ -0,0 +1 @@
+*.iml
Modified: incubator/rave/trunk/rave-commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/pom.xml?rev=1149421&r1=1149420&r2=1149421&view=diff
==============================================================================
--- incubator/rave/trunk/rave-commons/pom.xml (original)
+++ incubator/rave/trunk/rave-commons/pom.xml Fri Jul 22 00:38:32 2011
@@ -35,4 +35,39 @@
<description>Apache Rave Commons</description>
<packaging>jar</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ </dependency>
+ <!--Persistence-->
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+
+ <!-- Test -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ </dependencies>
+
</project>
\ No newline at end of file
Modified: incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/util/OverridablePropertyPlaceholderConfigurerTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/util/OverridablePropertyPlaceholderConfigurerTest.java?rev=1149421&r1=1149405&r2=1149421&view=diff
==============================================================================
--- incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/util/OverridablePropertyPlaceholderConfigurerTest.java (original)
+++ incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/util/OverridablePropertyPlaceholderConfigurerTest.java Fri Jul 22 00:38:32 2011
@@ -32,7 +32,7 @@ public class OverridablePropertyPlacehol
@Test
public void testSetLocation() throws Exception {
System.setProperty("portal.override.properties", "classpath:portal-test.properties");
- ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("applicationContext-test.xml","applicationContext-properties.xml");
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("applicationContext-test.xml");
final StringBuffer testBean = (StringBuffer) context.getBean("testBean");
assertEquals("Dummy value", testBean.toString());
Copied: incubator/rave/trunk/rave-commons/src/test/resources/applicationContext-test.xml (from r1149405, incubator/rave/trunk/rave-portal/src/test/resources/applicationContext-test.xml)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/src/test/resources/applicationContext-test.xml?p2=incubator/rave/trunk/rave-commons/src/test/resources/applicationContext-test.xml&p1=incubator/rave/trunk/rave-portal/src/test/resources/applicationContext-test.xml&r1=1149405&r2=1149421&rev=1149421&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/resources/applicationContext-test.xml (original)
+++ incubator/rave/trunk/rave-commons/src/test/resources/applicationContext-test.xml Fri Jul 22 00:38:32 2011
@@ -1,25 +1,30 @@
<!--
- 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.
+ ~ 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-3.0.xsd">
+ <bean id="portalPropertyPlaceholder" class="org.apache.rave.util.OverridablePropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ <property name="location" value="classpath:portal.properties"/>
+ </bean>
+
<!-- make the the portal.properties props available to autowire injectors -->
<bean id="testBean" class="java.lang.StringBuffer">
<constructor-arg value="${dummy.key}"/>