Author: tv
Date: Sun Nov 3 19:25:36 2013
New Revision: 1538423
URL: http://svn.apache.org/r1538423
Log:
- Derive from Turbine parent POM 3
- Update dependency servlet-api to 2.5
- Update dependency commons-lang to 2.6
- Update dependency commons-logging to 1.1.3
- Update dependency commons-pool to 1.6
- Update dependency fulcrum-parser to 1.0.3
- Update dependency fulcrum-upload to 1.0.5
Modified:
turbine/fulcrum/trunk/intake/pom.xml
turbine/fulcrum/trunk/intake/src/changes/changes.xml
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
Modified: turbine/fulcrum/trunk/intake/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/pom.xml?rev=1538423&r1=1538422&r2=1538423&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/pom.xml (original)
+++ turbine/fulcrum/trunk/intake/pom.xml Sun Nov 3 19:25:36 2013
@@ -17,17 +17,18 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-parent</artifactId>
- <version>1</version>
+ <groupId>org.apache.turbine</groupId>
+ <artifactId>turbine-parent</artifactId>
+ <version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-intake</artifactId>
<version>1.1.0-SNAPSHOT</version>
- <name>Fulcrum Intake</name>
+ <name>Fulcrum Intake Service</name>
<inceptionYear>2005</inceptionYear>
- <description>Fulcrum Intake Service</description>
+ <description>This Service provides rule-based input validation</description>
<url>http://turbine.apache.org/fulcrum/fulcrum-intake</url>
<scm>
@@ -36,14 +37,6 @@
<url>http://svn.apache.org/viewcvs/turbine/fulcrum/trunk/intake/</url>
</scm>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <name>Fulcrum Website</name>
-
<url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-intake/</url>
- </site>
- </distributionManagement>
-
<developers>
<developer>
<name>Eric Pugh</name>
@@ -89,35 +82,35 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parser</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-upload</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.4</version>
+ <version>1.6</version>
</dependency>
<!-- testing dependencies -->
@@ -157,25 +150,38 @@
<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>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- build the source and binary distribution packages -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>fulcrum-source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>bin</descriptorRef>
+ <descriptorRef>project</descriptorRef>
+ <descriptorRef>src</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileFormat>gnu</tarLongFileFormat>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
-
+
<properties>
- <maven.compile.source>1.5</maven.compile.source>
- <maven.compile.target>1.5</maven.compile.target>
- <!-- This bits are used for the staging directory -->
- <fulcrum.release.version>1.1.0</fulcrum.release.version>
- <fulcrum.rc.version>RC1</fulcrum.rc.version>
- <fulcrum.deployment.protocol>scpexe</fulcrum.deployment.protocol>
+ <turbine.site.path>fulcrum/fulcrum-intake</turbine.site.path>
</properties>
-
</project>
\ No newline at end of file
Modified: turbine/fulcrum/trunk/intake/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/changes/changes.xml?rev=1538423&r1=1538422&r2=1538423&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/intake/src/changes/changes.xml Sun Nov 3 19:25:36
2013
@@ -26,6 +26,27 @@
<body>
<release version="1.1.0" date="in Subversion">
+ <action dev="tv" type="update">
+ Derive from Turbine parent POM 3
+ </action>
+ <action dev="tv" type="update">
+ Update dependency servlet-api to 2.5
+ </action>
+ <action dev="tv" type="update">
+ Update dependency commons-lang to 2.6
+ </action>
+ <action dev="tv" type="update">
+ Update dependency commons-logging to 1.1.3
+ </action>
+ <action dev="tv" type="update">
+ Update dependency commons-pool to 1.6
+ </action>
+ <action dev="tv" type="update">
+ Update dependency fulcrum-parser to 1.0.3
+ </action>
+ <action dev="tv" type="update">
+ Update dependency fulcrum-upload to 1.0.5
+ </action>
<action type="update" dev="tv">
Introduce JDK 1.5 Generics
</action>
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java?rev=1538423&r1=1538422&r2=1538423&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
Sun Nov 3 19:25:36 2013
@@ -88,7 +88,7 @@ public class IntakeServiceImpl extends A
private Map<String, Map<String, Method>> setterMap;
/** AppData -> keyed Pools Map */
- private Map<AppData, KeyedObjectPool> keyedPools;
+ private Map<AppData, KeyedObjectPool<String, Group>> keyedPools;
/** The Avalon Container root directory */
private String applicationRoot;
@@ -372,7 +372,7 @@ public class IntakeServiceImpl extends A
}
try
{
- group = (Group) keyedPools.get(appData).borrowObject(groupName);
+ group = keyedPools.get(appData).borrowObject(groupName);
}
catch (Exception e)
{
@@ -435,7 +435,7 @@ public class IntakeServiceImpl extends A
+ groupName + " found");
}
- KeyedObjectPool kop = keyedPools.get(groupName);
+ KeyedObjectPool<String, Group> kop = keyedPools.get(groupName);
return kop.getNumActive(groupName) + kop.getNumIdle(groupName);
}
@@ -644,7 +644,7 @@ public class IntakeServiceImpl extends A
groupNameMap = new HashMap<String, String>();
getterMap = new HashMap<String, Map<String,Method>>();
setterMap = new HashMap<String, Map<String,Method>>();
- keyedPools = new HashMap<AppData, KeyedObjectPool>();
+ keyedPools = new HashMap<AppData, KeyedObjectPool<String, Group>>();
Set<File> xmlFiles = new HashSet<File>();
@@ -757,9 +757,10 @@ public class IntakeServiceImpl extends A
}
- KeyedPoolableObjectFactory factory = new Group.GroupFactory(
+ KeyedPoolableObjectFactory<String, Group> factory = new
Group.GroupFactory(
appData);
- keyedPools.put(appData, new StackKeyedObjectPool(factory,
+ keyedPools.put(appData,
+ new StackKeyedObjectPool<String, Group>(factory,
maxPooledGroups));
}
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java?rev=1538423&r1=1538422&r2=1538423&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
Sun Nov 3 19:25:36 2013
@@ -581,7 +581,7 @@ public class Group
// ********** PoolableObjectFactory implementation ******************
public static class GroupFactory
- extends BaseKeyedPoolableObjectFactory
+ extends BaseKeyedPoolableObjectFactory<String, Group>
{
private final AppData appData;
@@ -593,20 +593,19 @@ public class Group
/**
* Creates an instance that can be returned by the pool.
* @return an instance that can be returned by the pool.
- * @throws IntakeException indicates that the group could not be
retreived
+ * @throws IntakeException indicates that the group could not be
retrieved
*/
- public Object makeObject(Object key) throws IntakeException
+ public Group makeObject(String key) throws IntakeException
{
- return new Group(appData.getGroup((String) key));
+ return new Group(appData.getGroup(key));
}
/**
* Uninitialize an instance to be returned to the pool.
* @param obj the instance to be passivated
*/
- public void passivateObject(Object key, Object obj)
+ public void passivateObject(String key, Group group)
{
- Group group = (Group) obj;
group.oid = null;
group.pp = null;
for (int i = group.fieldsArray.length - 1; i >= 0; i--)
