joerg 2003/12/22 05:35:06
Modified: src/blocks/slide/java/org/apache/cocoon/components/source/impl
SlideSource.java SlideSourceFactory.java
src/blocks/slide/java/org/apache/cocoon/samples/slide
AdminHelper.java
src/blocks/slide/java/org/apache/cocoon/generation
SourceDescriptionGenerator.java
src/blocks/slide/java/org/apache/cocoon/acting
SourceMultiAction.java
Log:
removed unused local variables and fields - please review if it was only
preliminary state
Revision Changes Path
1.14 +1 -7
cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSource.java
Index: SlideSource.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSource.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SlideSource.java 14 Dec 2003 15:25:02 -0000 1.13
+++ SlideSource.java 22 Dec 2003 13:35:06 -0000 1.14
@@ -89,7 +89,6 @@
import org.apache.excalibur.xml.dom.DOMParser;
import org.apache.slide.authenticate.CredentialsToken;
import org.apache.slide.common.NamespaceAccessToken;
-import org.apache.slide.common.NamespaceConfig;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
import org.apache.slide.common.SlideTokenImpl;
@@ -104,7 +103,6 @@
import org.apache.slide.lock.NodeLock;
import org.apache.slide.macro.Macro;
import org.apache.slide.security.AccessDeniedException;
-import org.apache.slide.security.Security;
import org.apache.slide.structure.ObjectNode;
import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.structure.Structure;
@@ -130,13 +128,11 @@
/* Slide access */
private NamespaceAccessToken m_nat;
- private NamespaceConfig m_config;
private SlideToken m_slideToken;
/* Slide helpers */
private Structure m_structure;
private Content m_content;
- private Security m_security;
private Lock m_lock;
private Macro m_macro;
@@ -221,10 +217,8 @@
CredentialsToken credentials = new CredentialsToken(m_principal);
m_slideToken = new SlideTokenImpl(credentials);
- m_config = m_nat.getNamespaceConfig();
m_structure = m_nat.getStructureHelper();
m_content = m_nat.getContentHelper();
- m_security = m_nat.getSecurityHelper();
m_lock = m_nat.getLockHelper();
m_macro = m_nat.getMacroHelper();
1.11 +1 -4
cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSourceFactory.java
Index: SlideSourceFactory.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSourceFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SlideSourceFactory.java 14 Dec 2003 15:25:02 -0000 1.10
+++ SlideSourceFactory.java 22 Dec 2003 13:35:06 -0000 1.11
@@ -64,7 +64,6 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.slide.SlideRepository;
-import org.apache.cocoon.components.source.helpers.SourceCredential;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceFactory;
@@ -154,8 +153,6 @@
if (path == null || path.length() == 0) {
path = "/";
}
-
- SourceCredential credential;
NamespaceAccessToken nat = m_repository.getNamespaceToken(namespace);
if (nat == null) {
1.2 +1 -2
cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/samples/slide/AdminHelper.java
Index: AdminHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/samples/slide/AdminHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AdminHelper.java 14 Dec 2003 15:25:36 -0000 1.1
+++ AdminHelper.java 22 Dec 2003 13:35:06 -0000 1.2
@@ -98,7 +98,7 @@
try {
// make sure the role exists
- ObjectNode role = structure.retrieve(slideToken,roleUri);
+ structure.retrieve(slideToken,roleUri);
nat.begin();
ObjectNode user = new SubjectNode();
@@ -316,7 +316,6 @@
String userUri = usersPath + "/" + username;
SlideToken slideToken = new SlideTokenImpl(new
CredentialsToken(caller));
- Structure structure = nat.getStructureHelper();
Content content = nat.getContentHelper();
try {
1.9 +2 -3
cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/generation/SourceDescriptionGenerator.java
Index: SourceDescriptionGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/generation/SourceDescriptionGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SourceDescriptionGenerator.java 14 Dec 2003 15:22:54 -0000 1.8
+++ SourceDescriptionGenerator.java 22 Dec 2003 13:35:06 -0000 1.9
@@ -619,7 +619,6 @@
public void pushSourceLocks(LockableSource source)
throws SAXException, SourceException {
SourceLock[] locks = source.getSourceLocks();
- SourceLock lock;
if (locks != null && locks.length > 0) {
this.contentHandler.startElement(SOURCE_NS, LOCKS_NODE_NAME,
@@ -627,7 +626,7 @@
new AttributesImpl());
for (int i = 0; locks.length > 0; i++) {
- lock = (SourceLock) locks[i];
+ SourceLock lock = locks[i];
AttributesImpl attributes = new AttributesImpl();
1.4 +1 -4
cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/acting/SourceMultiAction.java
Index: SourceMultiAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/acting/SourceMultiAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SourceMultiAction.java 8 Dec 2003 18:06:44 -0000 1.3
+++ SourceMultiAction.java 22 Dec 2003 13:35:06 -0000 1.4
@@ -183,11 +183,8 @@
Request request = ObjectModelHelper.getRequest(objectModel);
String uri = parameters.getParameter(SOURCE_URI,
request.getParameter(SOURCE_URI));
- String collectionname = parameters.getParameter(SOURCE_NAME,
request.getParameter(SOURCE_NAME));
String principal = parameters.getParameter(PRINCIPAL,
request.getParameter(PRINCIPAL));
- String password = parameters.getParameter(PASSWORD,
- request.getParameter(PASSWORD));
getLogger().info("create collection called by '"+principal+"' for
'"+uri+"'");
