Author: tv
Date: Tue Mar 24 13:53:00 2009
New Revision: 757803
URL: http://svn.apache.org/viewvc?rev=757803&view=rev
Log:
Adjusted the IntakeTool to use IntakeServiceFacade instead of Intake
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java
turbine/core/trunk/xdocs/changes.xml
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java?rev=757803&r1=757802&r2=757803&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java
Tue Mar 24 13:53:00 2009
@@ -28,7 +28,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fulcrum.intake.Intake;
+import org.apache.fulcrum.intake.IntakeServiceFacade;
import org.apache.fulcrum.intake.IntakeException;
import org.apache.fulcrum.intake.Retrievable;
import org.apache.fulcrum.intake.model.Group;
@@ -79,7 +79,7 @@
*/
public IntakeTool()
{
- String[] groupNames = Intake.getGroupNames();
+ String[] groupNames = IntakeServiceFacade.getGroupNames();
int groupCount = 0;
if (groupNames != null)
{
@@ -105,14 +105,14 @@
String[] groupNames = null;
if (groupKeys == null || groupKeys.length == 0)
{
- groupNames = Intake.getGroupNames();
+ groupNames = IntakeServiceFacade.getGroupNames();
}
else
{
groupNames = new String[groupKeys.length];
for (int i = groupKeys.length - 1; i >= 0; i--)
{
- groupNames[i] = Intake.getGroupName(groupKeys[i]);
+ groupNames[i] = IntakeServiceFacade.getGroupName(groupKeys[i]);
}
}
@@ -121,7 +121,7 @@
{
try
{
- List foundGroups = Intake.getGroup(groupNames[i])
+ List foundGroups = IntakeServiceFacade.getGroup(groupNames[i])
.getObjects(pp);
if (foundGroups != null)
@@ -277,14 +277,14 @@
{
Group g = null;
- String inputKey = Intake.getGroupKey(groupName) + key;
+ String inputKey = IntakeServiceFacade.getGroupKey(groupName) + key;
if (groups.containsKey(inputKey))
{
g = (Group) groups.get(inputKey);
}
else if (create)
{
- g = Intake.getGroup(groupName);
+ g = IntakeServiceFacade.getGroup(groupName);
groups.put(inputKey, g);
g.init(key, pp);
}
@@ -305,7 +305,7 @@
try
{
- String inputKey = Intake.getGroupKey(groupName)
+ String inputKey = IntakeServiceFacade.getGroupKey(groupName)
+ obj.getQueryKey();
if (groups.containsKey(inputKey))
{
@@ -313,7 +313,7 @@
}
else
{
- g = Intake.getGroup(groupName);
+ g = IntakeServiceFacade.getGroup(groupName);
groups.put(inputKey, g);
}
@@ -372,11 +372,11 @@
{
if (groupName == null)
{
- throw new IntakeException("Intake.get: groupName == null");
+ throw new IntakeException("IntakeServiceFacade.get: groupName ==
null");
}
if (key == null)
{
- throw new IntakeException("Intake.get: key == null");
+ throw new IntakeException("IntakeServiceFacade.get: key == null");
}
PullHelper ph = get(groupName);
@@ -392,11 +392,11 @@
{
if (groupName == null)
{
- throw new IntakeException("Intake.get: groupName == null");
+ throw new IntakeException("IntakeServiceFacade.get: groupName ==
null");
}
if (key == null)
{
- throw new IntakeException("Intake.get: key == null");
+ throw new IntakeException("IntakeServiceFacade.get: key == null");
}
PullHelper ph = get(groupName);
@@ -433,7 +433,7 @@
try
{
- Intake.releaseGroup(group);
+ IntakeServiceFacade.releaseGroup(group);
}
catch (IntakeException ie)
{
@@ -500,7 +500,7 @@
try
{
- Intake.releaseGroup(g);
+ IntakeServiceFacade.releaseGroup(g);
}
catch (IntakeException ie)
{
Modified: turbine/core/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/changes.xml?rev=757803&r1=757802&r2=757803&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/changes.xml (original)
+++ turbine/core/trunk/xdocs/changes.xml Tue Mar 24 13:53:00 2009
@@ -26,6 +26,9 @@
<body>
<release version="4.0-dev" date="in Subversion">
<action type="update" dev="tv">
+ Adjusted the IntakeTool to use IntakeServiceFacade instead of Intake
+ </action>
+ <action type="update" dev="tv">
Made TurbineException extend JDK-1.4-Exception instead of commons-lang
NestableException.
</action>
