Author: sgoeschl
Date: Tue Dec 1 21:35:04 2009
New Revision: 885941
URL: http://svn.apache.org/viewvc?rev=885941&view=rev
Log:
Preparing RC1
Modified:
turbine/fulcrum/trunk/spring/pom.xml
turbine/fulcrum/trunk/spring/src/test/springIntoAvalonApplicationContext.xml
turbine/fulcrum/trunk/spring/src/test/springIntoAvalonComponentRoles.xml
turbine/fulcrum/trunk/spring/xdocs/changes.xml
turbine/fulcrum/trunk/spring/xdocs/index.xml
Modified: turbine/fulcrum/trunk/spring/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/spring/pom.xml?rev=885941&r1=885940&r2=885941&view=diff
==============================================================================
--- turbine/fulcrum/trunk/spring/pom.xml (original)
+++ turbine/fulcrum/trunk/spring/pom.xml Tue Dec 1 21:35:04 2009
@@ -66,12 +66,6 @@
<artifactId>avalon-framework-api</artifactId>
<version>4.3.1</version>
</dependency>
- <!-- Fulcrum dependecies -->
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-servicemanager</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
<!-- The YaafiContainerBean requires YAAFI -->
<dependency>
<groupId>org.apache.fulcrum</groupId>
@@ -96,7 +90,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -110,8 +104,25 @@
<!-- Default configuration for compiler source and target JVM -->
<maven.compile.source>1.4</maven.compile.source>
<maven.compile.target>1.4</maven.compile.target>
- <!-- the version to pick up -->
- <spring.version>1.2.9</spring.version>
+ <!-- This bits are used for the staging directory -->
+ <fulcrum.release.version>1.0.0</fulcrum.release.version>
+ <fulcrum.rc.version>RC1</fulcrum.rc.version>
+ <!-- the spring version to pick up -->
+ <spring.version>2.5.6</spring.version>
</properties>
+
+ <profiles>
+ <profile>
+ <id>rc</id>
+ <distributionManagement>
+ <!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
+ <site>
+ <id>apache.website</id>
+ <name>Apache Fulcrum Release Candidate Staging Site</name>
+
<url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url>
+ </site>
+ </distributionManagement>
+ </profile>
+ </profiles>
</project>
Modified:
turbine/fulcrum/trunk/spring/src/test/springIntoAvalonApplicationContext.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/spring/src/test/springIntoAvalonApplicationContext.xml?rev=885941&r1=885940&r2=885941&view=diff
==============================================================================
---
turbine/fulcrum/trunk/spring/src/test/springIntoAvalonApplicationContext.xml
(original)
+++
turbine/fulcrum/trunk/spring/src/test/springIntoAvalonApplicationContext.xml
Tue Dec 1 21:35:04 2009
@@ -22,7 +22,7 @@
<!-- Get a hold on an Avalon Service Manager -->
<bean id="avalonContainerBean"
- class="org.apache.fulcrum.servicemanager.ServiceManagerServiceImpl"
+
class="org.apache.fulcrum.yaafi.service.servicemanager.ServiceManagerServiceImpl"
factory-method="getInstance"
/>
Modified:
turbine/fulcrum/trunk/spring/src/test/springIntoAvalonComponentRoles.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/spring/src/test/springIntoAvalonComponentRoles.xml?rev=885941&r1=885940&r2=885941&view=diff
==============================================================================
--- turbine/fulcrum/trunk/spring/src/test/springIntoAvalonComponentRoles.xml
(original)
+++ turbine/fulcrum/trunk/spring/src/test/springIntoAvalonComponentRoles.xml
Tue Dec 1 21:35:04 2009
@@ -21,7 +21,7 @@
<role-list>
<role
name="serviceManagerService"
-
default-class="org.apache.fulcrum.servicemanager.ServiceManagerServiceImpl"
+
default-class="org.apache.fulcrum.yaafi.service.servicemanager.ServiceManagerServiceImpl"
/>
<role
name="systemPropertyService"
Modified: turbine/fulcrum/trunk/spring/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/spring/xdocs/changes.xml?rev=885941&r1=885940&r2=885941&view=diff
==============================================================================
--- turbine/fulcrum/trunk/spring/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/spring/xdocs/changes.xml Tue Dec 1 21:35:04 2009
@@ -24,7 +24,7 @@
</properties>
<body>
- <release version="1.0.0-SNAPSHOT" date="as in SVN">
+ <release version="1.0.0" date="2009-12-01">
<action dev="sgoeschl" type="add">
First cut for integrating with the Spring framework.
</action>
Modified: turbine/fulcrum/trunk/spring/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/spring/xdocs/index.xml?rev=885941&r1=885940&r2=885941&view=diff
==============================================================================
--- turbine/fulcrum/trunk/spring/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/spring/xdocs/index.xml Tue Dec 1 21:35:04 2009
@@ -158,6 +158,7 @@
<li>Spring 1.2.9</li>
<li>Spring 2.0.8</li>
<li>Spring 2.5.4</li>
+ <li>Spring 2.5.6</li>
</ul>
</subsection>
