You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/01/15 13:47:17 UTC
svn commit: r496301 - in /lenya/trunk/src: impl/java/org/apache/lenya/
impl/test/org/apache/lenya/cms/usecase/
modules-core/usecase-impl/config/cocoon-xconf/
modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/
modules-core/usecase-impl/...
Author: andreas
Date: Mon Jan 15 04:47:15 2007
New Revision: 496301
URL: http://svn.apache.org/viewvc?view=rev&rev=496301
Log:
Refactoring: move usecase impl classes to impl packages, preparation for join with usecase module
Added:
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java
- copied, changed from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizerImpl.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRoles.java
- copied, changed from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseRoles.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRolesBuilder.java
- copied, changed from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseRolesBuilder.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/impl/
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java
- copied, changed from r495641, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/GUIManagerImpl.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/impl/TabImpl.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/TestUsecaseInvoker.java
- copied, changed from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/TestUsecaseInvoker.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java
- copied, changed from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseInvokerImpl.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java
- copied, changed from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseProxy.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseResolverImpl.java
- copied, changed from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseResolverImpl.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseSelector.java
- copied, changed from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseSelector.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/impl/
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java
- copied, changed from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/UsecaseCronJob.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java
- copied, changed from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/UsecaseSchedulerImpl.java
lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecaseinvoker.xconf
lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecaseresolver.xconf
lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecasescheduler.xconf
Removed:
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizerImpl.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseRoles.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseRolesBuilder.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/TestUsecaseInvoker.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseInvokerImpl.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseProxy.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseResolverImpl.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseSelector.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/GUIManagerImpl.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/UsecaseCronJob.java
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/UsecaseSchedulerImpl.java
Modified:
lenya/trunk/src/impl/java/org/apache/lenya/lenya.roles
lenya/trunk/src/impl/test/org/apache/lenya/cms/usecase/AbstractUsecaseTest.java
lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/test-usecase-invoker.xconf
lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecase-authorizer.xconf
lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecasecronjob.xconf
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/Tab.java
lenya/trunk/src/webapp/lenya/usecases/usecases.js
Modified: lenya/trunk/src/impl/java/org/apache/lenya/lenya.roles
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/lenya.roles?view=diff&rev=496301&r1=496300&r2=496301
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/lenya.roles (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/lenya.roles Mon Jan 15 04:47:15 2007
@@ -109,16 +109,8 @@
<role name="org.apache.lenya.cms.usecase.UsecaseSelector"
shorthand="usecases"
- default-class="org.apache.lenya.cms.usecase.UsecaseSelector"/>
+ default-class="org.apache.lenya.cms.usecase.impl.UsecaseSelector"/>
- <role name="org.apache.lenya.cms.usecase.UsecaseInvoker"
- shorthand="usecase-invoker"
- default-class="org.apache.lenya.cms.usecase.UsecaseInvokerImpl"/>
-
- <role name="org.apache.lenya.cms.usecase.UsecaseResolver"
- shorthand="usecase-resolver"
- default-class="org.apache.lenya.cms.usecase.UsecaseResolverImpl"/>
-
<role name="org.apache.lenya.cms.cocoon.flow.FlowHelper"
shorthand="flowhelper"
default-class="org.apache.lenya.cms.cocoon.flow.FlowHelperImpl"/>
@@ -155,13 +147,9 @@
shorthand="template-instantiators"
default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
- <role name="org.apache.lenya.cms.usecase.scheduling.UsecaseScheduler"
- shorthand="usecase-scheduler"
- default-class="org.apache.lenya.cms.usecase.scheduling.UsecaseSchedulerImpl"/>
-
<role name="org.apache.lenya.cms.usecase.gui.GUIManager"
shorthand="gui-manager"
- default-class="org.apache.lenya.cms.usecase.gui.GUIManagerImpl"/>
+ default-class="org.apache.lenya.cms.usecase.gui.impl.GUIManagerImpl"/>
<role name="org.apache.lenya.cms.publication.ResourceTypeSelector"
shorthand="resource-types"
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/usecase/AbstractUsecaseTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/usecase/AbstractUsecaseTest.java?view=diff&rev=496301&r1=496300&r2=496301
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/usecase/AbstractUsecaseTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/usecase/AbstractUsecaseTest.java Mon Jan 15 04:47:15 2007
@@ -24,6 +24,7 @@
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.impl.AbstractAccessControlTest;
+import org.apache.lenya.cms.usecase.impl.TestUsecaseInvoker;
/**
* Usecase test base class.
Modified: lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/test-usecase-invoker.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/test-usecase-invoker.xconf?view=diff&rev=496301&r1=496300&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/test-usecase-invoker.xconf (original)
+++ lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/test-usecase-invoker.xconf Mon Jan 15 04:47:15 2007
@@ -22,8 +22,8 @@
-->
<xconf xpath="/cocoon"
- unless="/cocoon/component[@role = 'org.apache.lenya.cms.usecase.TestUsecaseInvoker']">
+ unless="/cocoon/component[@role = 'org.apache.lenya.cms.usecase.impl.TestUsecaseInvoker']">
<component logger="lenya.usecase.invoker"
- class="org.apache.lenya.cms.usecase.TestUsecaseInvoker"
- role="org.apache.lenya.cms.usecase.TestUsecaseInvoker"/>
+ class="org.apache.lenya.cms.usecase.impl.TestUsecaseInvoker"
+ role="org.apache.lenya.cms.usecase.impl.TestUsecaseInvoker"/>
</xconf>
Modified: lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecase-authorizer.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecase-authorizer.xconf?view=diff&rev=496301&r1=496300&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecase-authorizer.xconf (original)
+++ lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecase-authorizer.xconf Mon Jan 15 04:47:15 2007
@@ -23,7 +23,7 @@
<xconf xpath="/cocoon/authorizers" unless="/cocoon/authorizers/component-instance[@name = 'usecase']">
<component-instance name="usecase"
- class="org.apache.lenya.cms.ac.usecase.UsecaseAuthorizerImpl"
+ class="org.apache.lenya.cms.ac.usecase.impl.UsecaseAuthorizerImpl"
logger="lenya.ac.authorizer.usecase"/>
</xconf>
Modified: lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecasecronjob.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecasecronjob.xconf?view=diff&rev=496301&r1=496300&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecasecronjob.xconf (original)
+++ lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecasecronjob.xconf Mon Jan 15 04:47:15 2007
@@ -23,7 +23,7 @@
<xconf xpath="/cocoon" unless="/cocoon/component[@role = 'org.apache.cocoon.components.cron.CronJob/usecase']">
<component role="org.apache.cocoon.components.cron.CronJob/usecase"
- class="org.apache.lenya.cms.usecase.scheduling.UsecaseCronJob"
+ class="org.apache.lenya.cms.usecase.scheduling.impl.UsecaseCronJob"
logger="cron.usecase"/>
</xconf>
Copied: lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java (from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizerImpl.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java?view=diff&rev=496301&p1=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizerImpl.java&r1=494821&p2=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizerImpl.java (original)
+++ lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java Mon Jan 15 04:47:15 2007
@@ -16,7 +16,7 @@
*
*/
-package org.apache.lenya.cms.ac.usecase;
+package org.apache.lenya.cms.ac.usecase.impl;
import java.io.File;
import java.util.Arrays;
@@ -42,6 +42,7 @@
import org.apache.lenya.ac.cache.CachingException;
import org.apache.lenya.ac.cache.SourceCache;
import org.apache.lenya.cms.ac.PolicyUtil;
+import org.apache.lenya.cms.ac.usecase.UsecaseAuthorizer;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationException;
import org.apache.lenya.cms.publication.PublicationUtil;
Copied: lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRoles.java (from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseRoles.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRoles.java?view=diff&rev=496301&p1=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseRoles.java&r1=494821&p2=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRoles.java&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseRoles.java (original)
+++ lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRoles.java Mon Jan 15 04:47:15 2007
@@ -16,7 +16,7 @@
*
*/
-package org.apache.lenya.cms.ac.usecase;
+package org.apache.lenya.cms.ac.usecase.impl;
import java.util.Arrays;
import java.util.HashMap;
Copied: lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRolesBuilder.java (from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseRolesBuilder.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRolesBuilder.java?view=diff&rev=496301&p1=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseRolesBuilder.java&r1=494821&p2=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRolesBuilder.java&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/UsecaseRolesBuilder.java (original)
+++ lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRolesBuilder.java Mon Jan 15 04:47:15 2007
@@ -16,7 +16,7 @@
*
*/
-package org.apache.lenya.cms.ac.usecase;
+package org.apache.lenya.cms.ac.usecase.impl;
import java.io.InputStream;
import java.util.HashSet;
Copied: lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java (from r495641, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/GUIManagerImpl.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java?view=diff&rev=496301&p1=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/GUIManagerImpl.java&r1=495641&p2=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/GUIManagerImpl.java (original)
+++ lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java Mon Jan 15 04:47:15 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.lenya.cms.usecase.gui;
+package org.apache.lenya.cms.usecase.gui.impl;
import java.util.ArrayList;
import java.util.HashMap;
@@ -50,6 +50,8 @@
import org.apache.lenya.cms.usecase.Usecase;
import org.apache.lenya.cms.usecase.UsecaseMessage;
import org.apache.lenya.cms.usecase.UsecaseResolver;
+import org.apache.lenya.cms.usecase.gui.GUIManager;
+import org.apache.lenya.cms.usecase.gui.Tab;
import org.apache.lenya.util.ServletHelper;
/**
@@ -81,7 +83,7 @@
String name = tabConfigs[j].getAttribute(ATTRIBUTE_NAME);
String label = tabConfigs[j].getAttribute(ATTRIBUTE_LABEL);
String usecase = tabConfigs[j].getAttribute(ATTRIBUTE_USECASE);
- Tab tab = new Tab(groupName, name, usecase, label);
+ TabImpl tab = new TabImpl(groupName, name, usecase, label);
group.add(tab);
Configuration[] paramConfigs = tabConfigs[j].getChildren(ELEMENT_PARAMETER);
Added: lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/impl/TabImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/impl/TabImpl.java?view=auto&rev=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/impl/TabImpl.java (added)
+++ lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/impl/TabImpl.java Mon Jan 15 04:47:15 2007
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.lenya.cms.usecase.gui.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.lenya.cms.usecase.gui.Tab;
+
+/**
+ * Tab implementation.
+ */
+public class TabImpl implements Tab {
+
+ /**
+ * Ctor.
+ * @param group The name of the usecase group.
+ * @param name The name of the tab.
+ * @param usecase The usecase to be displayed.
+ * @param label The label to be displayed on the tab.
+ */
+ public TabImpl(String group, String name, String usecase, String label) {
+ this.name = name;
+ this.group = group;
+ this.usecase = usecase;
+ this.label = label;
+ }
+
+ private Map parameters = new HashMap();
+
+ private String name;
+
+ void setParameter(String name, String value) {
+ this.parameters.put(name, value);
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ private String usecase;
+
+ private String label;
+
+ public String getLabel() {
+ return label;
+ }
+
+ public String getUsecase() {
+ return usecase;
+ }
+
+ private String group;
+
+ public String getGroup() {
+ return this.group;
+ }
+
+ public String[] getParameterNames() {
+ Set keys = this.parameters.keySet();
+ return (String[]) keys.toArray(new String[keys.size()]);
+ }
+
+ public String getParameter(String key) {
+ return (String) this.parameters.get(key);
+ }
+
+}
Copied: lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/TestUsecaseInvoker.java (from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/TestUsecaseInvoker.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/TestUsecaseInvoker.java?view=diff&rev=496301&p1=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/TestUsecaseInvoker.java&r1=494821&p2=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/TestUsecaseInvoker.java&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/TestUsecaseInvoker.java (original)
+++ lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/TestUsecaseInvoker.java Mon Jan 15 04:47:15 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.lenya.cms.usecase;
+package org.apache.lenya.cms.usecase.impl;
/**
* Invoker for test usecases. The transactions are not committed.
Copied: lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java (from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseInvokerImpl.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java?view=diff&rev=496301&p1=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseInvokerImpl.java&r1=494821&p2=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseInvokerImpl.java (original)
+++ lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java Mon Jan 15 04:47:15 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.lenya.cms.usecase;
+package org.apache.lenya.cms.usecase.impl;
import java.util.ArrayList;
import java.util.Collections;
@@ -27,6 +27,11 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
+import org.apache.lenya.cms.usecase.Usecase;
+import org.apache.lenya.cms.usecase.UsecaseException;
+import org.apache.lenya.cms.usecase.UsecaseInvoker;
+import org.apache.lenya.cms.usecase.UsecaseMessage;
+import org.apache.lenya.cms.usecase.UsecaseResolver;
/**
* Usecase invoker implementation.
Copied: lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java (from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseProxy.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java?view=diff&rev=496301&p1=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseProxy.java&r1=494821&p2=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseProxy.java (original)
+++ lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java Mon Jan 15 04:47:15 2007
@@ -15,12 +15,15 @@
* limitations under the License.
*
*/
-package org.apache.lenya.cms.usecase;
+package org.apache.lenya.cms.usecase.impl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
+import org.apache.lenya.cms.usecase.Usecase;
+import org.apache.lenya.cms.usecase.UsecaseView;
/**
* Proxy which holds the parameters of a usecase. It is used to restore the usecase after the
Copied: lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseResolverImpl.java (from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseResolverImpl.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseResolverImpl.java?view=diff&rev=496301&p1=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseResolverImpl.java&r1=494821&p2=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseResolverImpl.java&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseResolverImpl.java (original)
+++ lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseResolverImpl.java Mon Jan 15 04:47:15 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.lenya.cms.usecase;
+package org.apache.lenya.cms.usecase.impl;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -34,6 +34,8 @@
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.cms.publication.templating.PublicationTemplateManager;
+import org.apache.lenya.cms.usecase.Usecase;
+import org.apache.lenya.cms.usecase.UsecaseResolver;
/**
* Usecase resolver implementation.
Copied: lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseSelector.java (from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseSelector.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseSelector.java?view=diff&rev=496301&p1=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseSelector.java&r1=494821&p2=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseSelector.java&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/UsecaseSelector.java (original)
+++ lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/UsecaseSelector.java Mon Jan 15 04:47:15 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.lenya.cms.usecase;
+package org.apache.lenya.cms.usecase.impl;
import java.util.Iterator;
import java.util.SortedSet;
@@ -29,6 +29,7 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.ExtendedComponentSelector;
+import org.apache.lenya.cms.usecase.UsecaseResolver;
/**
* Usecase selector.
Copied: lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java (from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/UsecaseCronJob.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java?view=diff&rev=496301&p1=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/UsecaseCronJob.java&r1=494821&p2=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/UsecaseCronJob.java (original)
+++ lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java Mon Jan 15 04:47:15 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.lenya.cms.usecase.scheduling;
+package org.apache.lenya.cms.usecase.scheduling.impl;
import java.util.Collections;
import java.util.Enumeration;
Copied: lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java (from r494821, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/UsecaseSchedulerImpl.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java?view=diff&rev=496301&p1=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/UsecaseSchedulerImpl.java&r1=494821&p2=lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/UsecaseSchedulerImpl.java (original)
+++ lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java Mon Jan 15 04:47:15 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.lenya.cms.usecase.scheduling;
+package org.apache.lenya.cms.usecase.scheduling.impl;
import java.util.Date;
import java.util.HashMap;
@@ -39,6 +39,7 @@
import org.apache.lenya.ac.Machine;
import org.apache.lenya.ac.User;
import org.apache.lenya.cms.usecase.Usecase;
+import org.apache.lenya.cms.usecase.scheduling.UsecaseScheduler;
/**
* Usecase scheduler implementation.
Added: lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecaseinvoker.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecaseinvoker.xconf?view=auto&rev=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecaseinvoker.xconf (added)
+++ lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecaseinvoker.xconf Mon Jan 15 04:47:15 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
+<!--
+ This file defines the publication specific use-cases
+-->
+
+ <xconf xpath="/cocoon" unless="/cocoon/component[@role = 'org.apache.lenya.cms.usecase.UsecaseInvoker']">
+ <component
+ role="org.apache.lenya.cms.usecase.UsecaseInvoker"
+ class="org.apache.lenya.cms.usecase.impl.UsecaseInvokerImpl"
+ logger="lenya.usecase"/>
+ </xconf>
+
Added: lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecaseresolver.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecaseresolver.xconf?view=auto&rev=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecaseresolver.xconf (added)
+++ lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecaseresolver.xconf Mon Jan 15 04:47:15 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
+<!--
+ This file defines the publication specific use-cases
+-->
+
+ <xconf xpath="/cocoon" unless="/cocoon/component[@role = 'org.apache.lenya.cms.usecase.UsecaseResolver']">
+ <component
+ role="org.apache.lenya.cms.usecase.UsecaseResolver"
+ class="org.apache.lenya.cms.usecase.impl.UsecaseResolverImpl"
+ logger="lenya.usecase"/>
+ </xconf>
+
Added: lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecasescheduler.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecasescheduler.xconf?view=auto&rev=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecasescheduler.xconf (added)
+++ lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecasescheduler.xconf Mon Jan 15 04:47:15 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
+<!--
+ This file defines the publication specific use-cases
+-->
+
+ <xconf xpath="/cocoon" unless="/cocoon/component[@role = 'org.apache.lenya.cms.usecase.scheduling.UsecaseScheduler']">
+ <component
+ role="org.apache.lenya.cms.usecase.scheduling.UsecaseScheduler"
+ class="org.apache.lenya.cms.usecase.scheduling.impl.UsecaseSchedulerImpl"
+ logger="lenya.usecase"/>
+ </xconf>
+
Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/Tab.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/Tab.java?view=diff&rev=496301&r1=496300&r2=496301
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/Tab.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/Tab.java Mon Jan 15 04:47:15 2007
@@ -17,78 +17,41 @@
*/
package org.apache.lenya.cms.usecase.gui;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
/**
* Tab in a tabbed multiple-usecase environment.
*/
-public class Tab {
-
- /**
- * Ctor.
- * @param group The name of the usecase group.
- * @param name The name of the tab.
- * @param usecase The usecase to be displayed.
- * @param label The label to be displayed on the tab.
- */
- public Tab(String group, String name, String usecase, String label) {
- this.name = name;
- this.group = group;
- this.usecase = usecase;
- this.label = label;
- }
-
- private Map parameters = new HashMap();
-
- private String name;
+public interface Tab {
/**
* @return The name of the tab.
*/
- public String getName() {
- return this.name;
- }
-
- private String usecase;
-
- private String label;
+ String getName();
/**
* @return The label.
*/
- public String getLabel() {
- return label;
- }
+ public String getLabel();
/**
* @return The usecase which is displayed on the tab.
*/
- public String getUsecase() {
- return usecase;
- }
-
- private String group;
+ public String getUsecase();
/**
* @return The group this tab belongs to.
*/
- public String getGroup() {
- return this.group;
- }
-
- void setParameter(String name, String value) {
- this.parameters.put(name, value);
- }
+ public String getGroup();
- String[] getParameterNames() {
- Set keys = this.parameters.keySet();
- return (String[]) keys.toArray(new String[keys.size()]);
- }
+ /**
+ * @return The names of the parameters to pass to the usecase upon invocation.
+ */
+ public String[] getParameterNames();
- String getParameter(String key) {
- return (String) this.parameters.get(key);
- }
+ /**
+ * Returns the value of a certain parameter to pass to the usecase upon invocation.
+ * @param key The value.
+ * @return A string.
+ */
+ public String getParameter(String key);
}
Modified: lenya/trunk/src/webapp/lenya/usecases/usecases.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/usecases/usecases.js?view=diff&rev=496301&r1=496300&r2=496301
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/usecases.js (original)
+++ lenya/trunk/src/webapp/lenya/usecases/usecases.js Mon Jan 15 04:47:15 2007
@@ -315,7 +315,7 @@
usecase.checkPreconditions();
usecase.lockInvolvedObjects();
// create proxy object to save usecase state
- proxy = new Packages.org.apache.lenya.cms.usecase.UsecaseProxy(usecase);
+ proxy = new Packages.org.apache.lenya.cms.usecase.impl.UsecaseProxy(usecase);
view = usecase.getView();
log("debug", "Successfully prepared usecase.", usecaseName);
} catch (exception) {
@@ -352,7 +352,7 @@
passRequestParameters(usecase);
state = submitFlow(usecase, generic);
// create a new proxy with the updated usecase state
- proxy = new Packages.org.apache.lenya.cms.usecase.UsecaseProxy(usecase);
+ proxy = new Packages.org.apache.lenya.cms.usecase.impl.UsecaseProxy(usecase);
releaseUsecase(usecase);
} while (state == "continue");
// If the usecase does not have a view uri, we can directly jump to
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org