You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dd...@apache.org on 2008/04/11 11:38:23 UTC
svn commit: r647088 [2/5] - in /portals/pluto/branches/2.0-spi-refactoring:
pluto-container-api/
pluto-container-api/src/main/java/org/apache/pluto/om/common/
pluto-container-api/src/main/java/org/apache/pluto/om/portlet/
pluto-container-api/src/main/j...
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/LoadOnStartup.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/LoadOnStartup.java?rev=647088&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/LoadOnStartup.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/LoadOnStartup.java Fri Apr 11 02:37:29 2008
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed 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.pluto.om.servlet;
+
+public interface LoadOnStartup {
+
+ public abstract int getPriority();
+
+ public abstract void setPriority(int priority);
+
+}
\ No newline at end of file
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/LoginConfig.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/LoginConfig.java?rev=647088&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/LoginConfig.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/LoginConfig.java Fri Apr 11 02:37:29 2008
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed 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.pluto.om.servlet;
+
+public interface LoginConfig {
+
+ public abstract String getAuthMethod();
+
+ public abstract void setAuthMethod(String authMethod);
+
+ public abstract String getRealmName();
+
+ public abstract void setRealmName(String realmName);
+
+ public abstract FormLoginConfig getFormLoginConfig();
+
+ public abstract void setFormLoginConfig(FormLoginConfig formLoginConfig);
+
+}
\ No newline at end of file
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/MimeMapping.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/MimeMapping.java?rev=647088&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/MimeMapping.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/MimeMapping.java Fri Apr 11 02:37:29 2008
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed 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.pluto.om.servlet;
+
+public interface MimeMapping {
+
+ public abstract String getMimeType();
+
+ public abstract void setMimeType(String mimeType);
+
+ public abstract String getExtension();
+
+ public abstract void setExtension(String extension);
+
+}
\ No newline at end of file
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/ResourceRef.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/ResourceRef.java?rev=647088&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/ResourceRef.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/ResourceRef.java Fri Apr 11 02:37:29 2008
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed 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.pluto.om.servlet;
+
+public interface ResourceRef {
+
+ public abstract String getDescription();
+
+ public abstract void setDescription(String description);
+
+ public abstract String getResRefName();
+
+ public abstract void setResRefName(String resRefName);
+
+ public abstract String getResType();
+
+ public abstract void setResType(String resType);
+
+ public abstract String getResAuth();
+
+ public abstract void setResAuth(String resAuth);
+
+ public abstract String getResSharingScope();
+
+ public abstract void setResSharingScope(String resSharingScope);
+
+}
\ No newline at end of file
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/SecurityConstraint.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/SecurityConstraint.java?rev=647088&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/SecurityConstraint.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/SecurityConstraint.java Fri Apr 11 02:37:29 2008
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed 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.pluto.om.servlet;
+
+import java.util.List;
+
+import org.apache.pluto.om.common.UserDataConstraint;
+
+public interface SecurityConstraint {
+
+ public abstract String getDisplayName();
+
+ public abstract void setDisplayName(String displayName);
+
+ public abstract List getWebResourceCollections();
+
+ public abstract void setWebResourceCollections(List webResourceCollection);
+
+ public abstract AuthConstraint getAuthConstraint();
+
+ public abstract void setAuthConstraint(AuthConstraint authConstraint);
+
+ public abstract UserDataConstraint getUserDataConstraint();
+
+ public abstract void setUserDataConstraint(
+ UserDataConstraint userDataConstraint);
+
+}
\ No newline at end of file
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/SecurityRole.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/SecurityRole.java?rev=647088&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/SecurityRole.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/SecurityRole.java Fri Apr 11 02:37:29 2008
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed 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.pluto.om.servlet;
+
+public interface SecurityRole {
+
+ public abstract String getDescription();
+
+ public abstract void setDescription(String description);
+
+ public abstract String getRoleName();
+
+ public abstract void setRoleName(String roleName);
+
+}
\ No newline at end of file
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/Servlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/Servlet.java?rev=647088&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/Servlet.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/Servlet.java Fri Apr 11 02:37:29 2008
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed 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.pluto.om.servlet;
+
+import java.util.List;
+
+import org.apache.pluto.om.common.Icon;
+
+public interface Servlet {
+
+ public abstract String getServletName();
+
+ public abstract void setServletName(String servletName);
+
+ public abstract String getServletClass();
+
+ public abstract void setServletClass(String servletClass);
+
+ public abstract String getDisplayName();
+
+ public abstract void setDisplayName(String displayName);
+
+ public abstract String getJspFile();
+
+ public abstract void setJspFile(String jspFile);
+
+ public abstract LoadOnStartup getLoadOnStartup();
+
+ public abstract void setLoadOnStartup(LoadOnStartup loadOnStartup);
+
+ public abstract String getDescription();
+
+ public abstract void setDescription(String description);
+
+ public abstract Icon getIcon();
+
+ public abstract void setIcon(Icon icon);
+
+ public abstract List getInitParams();
+
+ public abstract void setInitParams(List initParams);
+
+ public abstract List getSecurityRoleRefs();
+
+ public abstract void setSecurityRoleRefs(List securityRoleRefs);
+
+}
\ No newline at end of file
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/ServletMapping.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/ServletMapping.java?rev=647088&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/ServletMapping.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/ServletMapping.java Fri Apr 11 02:37:29 2008
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed 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.pluto.om.servlet;
+
+public interface ServletMapping {
+
+ public abstract String getServletName();
+
+ public abstract void setServletName(String filterName);
+
+ public abstract String getUrlPattern();
+
+ public abstract void setUrlPattern(String urlPattern);
+
+}
\ No newline at end of file
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/SessionConfig.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/SessionConfig.java?rev=647088&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/SessionConfig.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/SessionConfig.java Fri Apr 11 02:37:29 2008
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed 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.pluto.om.servlet;
+
+public interface SessionConfig {
+
+ public abstract int getSessionTimeout();
+
+ public abstract void setSessionTimeout(int sessionTimeout);
+
+}
\ No newline at end of file
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/Taglib.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/Taglib.java?rev=647088&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/Taglib.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/Taglib.java Fri Apr 11 02:37:29 2008
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed 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.pluto.om.servlet;
+
+public interface Taglib {
+
+ public abstract String getTaglibUri();
+
+ public abstract void setTaglibUri(String taglibUri);
+
+ public abstract String getTaglibLocation();
+
+ public abstract void setTaglibLocation(String taglibLocation);
+
+}
\ No newline at end of file
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/WebApp.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/WebApp.java?rev=647088&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/WebApp.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/WebApp.java Fri Apr 11 02:37:29 2008
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed 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.pluto.om.servlet;
+
+import java.util.List;
+
+import org.apache.pluto.om.common.Icon;
+
+public interface WebApp {
+
+ public abstract Icon getIcon();
+
+ public abstract void setIcon(Icon icon);
+
+ public abstract String getDisplayName();
+
+ public abstract void setDisplayName(String displayName);
+
+ public abstract String getDescription();
+
+ public abstract void setDescription(String description);
+
+ public abstract boolean isDistributable();
+
+ public abstract Distributable getDistributable();
+
+ public abstract void setDistributable();
+
+ public abstract void setDistributable(boolean distributable);
+
+ public abstract List getContextParams();
+
+ public abstract void setContextParams(List contextParams);
+
+ public abstract List getFilters();
+
+ public abstract void setFilters(List filters);
+
+ public abstract List getFilterMappings();
+
+ public abstract void setFilterMappings(List filterMappings);
+
+ public abstract List getListeners();
+
+ public abstract void setListeners(List listeners);
+
+ public abstract List getServlets();
+
+ public abstract void setServlets(List servlets);
+
+ public abstract List getServletMappings();
+
+ public abstract void setServletMappings(List servletMappings);
+
+ public abstract SessionConfig getSessionConfig();
+
+ public abstract void setSessionConfig(SessionConfig sessionConfig);
+
+ public abstract List getMimeMappings();
+
+ public abstract void setMimeMappings(List mimeMappings);
+
+ public abstract WelcomeFileList getWelcomeFileList();
+
+ public abstract void setWelcomeFileList(WelcomeFileList welcomeFileList);
+
+ public abstract List getErrorPages();
+
+ public abstract void setErrorPages(List errorPages);
+
+ public abstract List getTaglibs();
+
+ public abstract void setTaglibs(List taglibs);
+
+ public abstract List getResourceRefs();
+
+ public abstract void setResourceRefs(List resourceRefs);
+
+ public abstract List getSecurityConstraints();
+
+ public abstract void setSecurityConstraints(List securityConstraints);
+
+ public abstract LoginConfig getLoginConfig();
+
+ public abstract void setLoginConfig(LoginConfig loginConfig);
+
+ public abstract List getSecurityRoles();
+
+ public abstract void setSecurityRoles(List securityRoles);
+
+ public abstract List getEnvEntrys();
+
+ public abstract void setEnvEntrys(List envEntrys);
+
+ public abstract List getEjbRefs();
+
+ public abstract void setEjbRefs(List ejbRefs);
+
+ public abstract String getServletVersion();
+
+ public abstract void setServletVersion(String servletVersion);
+
+ public abstract Servlet getServlet(String name);
+
+ public abstract ServletMapping getServletMapping(String uri);
+
+}
\ No newline at end of file
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/WebResourceCollection.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/WebResourceCollection.java?rev=647088&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/WebResourceCollection.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/WebResourceCollection.java Fri Apr 11 02:37:29 2008
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed 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.pluto.om.servlet;
+
+import java.util.List;
+
+public interface WebResourceCollection {
+
+ public abstract String getWebResourceName();
+
+ public abstract void setWebResourceName(String webResourceName);
+
+ public abstract String getDescription();
+
+ public abstract void setDescription(String description);
+
+ public abstract List getHttpMethods();
+
+ public abstract void setHttpMethods(List httpMethods);
+
+ public abstract List getUrlPatterns();
+
+ public abstract void setUrlPatterns(List urlPatterns);
+
+}
\ No newline at end of file
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/WelcomeFileList.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/WelcomeFileList.java?rev=647088&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/WelcomeFileList.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/WelcomeFileList.java Fri Apr 11 02:37:29 2008
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed 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.pluto.om.servlet;
+
+import java.util.List;
+
+public interface WelcomeFileList {
+
+ public abstract List getWelcomeFiles();
+
+ public abstract void setWelcomeFiles(List welcomeFiles);
+
+}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java Fri Apr 11 02:37:29 2008
@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.pluto.descriptors.portlet.PortletAppDD;
+import org.apache.pluto.om.portlet.PortletApp;
/**
* The publicized entry point into Pluto. The base functionality of the portlet
@@ -181,7 +182,7 @@
* the context of the portlet, or retrieving
* the <code>PortletAppDD</code>
*/
- PortletAppDD getPortletApplicationDescriptor(String context)
+ PortletApp getPortletApplicationDescriptor(String context)
throws PortletContainerException;
public ServletContext getServletContext();
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInfoService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInfoService.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInfoService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInfoService.java Fri Apr 11 02:37:29 2008
@@ -18,8 +18,8 @@
package org.apache.pluto.core;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.om.portlet.Portlet;
import org.apache.pluto.spi.optional.PortletInfoService;
@@ -49,7 +49,7 @@
return null;
}
- private PortletDD getPortletDefinition(InternalPortletWindow window) {
+ private Portlet getPortletDefinition(InternalPortletWindow window) {
return window.getPortletEntity().getPortletDefinition();
}
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java Fri Apr 11 02:37:29 2008
@@ -42,7 +42,6 @@
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletWindow;
import org.apache.pluto.RequiredContainerServices;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
//import org.apache.pluto.driver.core.PortletWindowImpl;
import org.apache.pluto.internal.PortletDescriptorRegistry;
import org.apache.pluto.internal.InternalPortletRequest;
@@ -57,6 +56,7 @@
import org.apache.pluto.internal.InternalResourceRequest;
import org.apache.pluto.internal.InternalResourceResponse;
import org.apache.pluto.internal.impl.StateAwareResponseImpl;
+import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.spi.EventProvider;
import org.apache.pluto.spi.FilterManager;
import org.apache.pluto.spi.PortletURLProvider;
@@ -431,7 +431,7 @@
return optionalContainerServices;
}
- public PortletAppDD getPortletApplicationDescriptor(String context)
+ public PortletApp getPortletApplicationDescriptor(String context)
throws PortletContainerException {
// make sure the container has initialized
@@ -456,7 +456,7 @@
// obtain the portlet application descriptor for the portlet
// context.
- PortletAppDD portletAppDD = PortletDescriptorRegistry
+ PortletApp portletAppDD = PortletDescriptorRegistry
.getRegistry()
.getPortletAppDD(portletCtx);
@@ -654,7 +654,7 @@
* @throws PortletContainerException
*/
private FilterManager filterInitialisation(InternalPortletWindow internalPortletWindow,String lifeCycle) throws PortletContainerException{
- PortletAppDD portletAppDD = getOptionalContainerServices().getPortletRegistryService().getPortletApplicationDescriptor(internalPortletWindow.getContextPath());
+ PortletApp portletAppDD = getOptionalContainerServices().getPortletRegistryService().getPortletApplicationDescriptor(internalPortletWindow.getContextPath());
String portletName = internalPortletWindow.getPortletName();
return requiredContainerServices.getPortalCallbackService().getFilterManager(portletAppDD,portletName,lifeCycle);
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java Fri Apr 11 02:37:29 2008
@@ -19,14 +19,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.internal.Configuration;
import org.apache.pluto.internal.InternalPortletConfig;
import org.apache.pluto.internal.InternalPortletContext;
import org.apache.pluto.internal.PortletDescriptorRegistry;
import org.apache.pluto.internal.impl.PortletConfigImpl;
import org.apache.pluto.internal.impl.PortletContextImpl;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.spi.optional.PortletRegistryEvent;
import org.apache.pluto.spi.optional.PortletRegistryListener;
import org.apache.pluto.spi.optional.PortletRegistryService;
@@ -127,14 +127,14 @@
public String register(ServletConfig config) throws PortletContainerException {
InternalPortletContext portletContext = register(config.getServletContext());
- PortletAppDD portletAppDD =
+ PortletApp portletAppDD =
portletContext.getPortletApplicationDefinition();
- PortletDD portletDD = null;
+ Portlet portletDD = null;
LOG.info("Registering "+portletAppDD.getPortlets().size()+" portlets for context "+portletContext.getApplicationId());
for (Iterator it = portletAppDD.getPortlets().iterator(); it.hasNext();) {
- portletDD = (PortletDD) it.next();
+ portletDD = (Portlet) it.next();
portletConfigs.put(
portletContext.getApplicationId() + "/" + portletDD.getPortletName(),
new PortletConfigImpl(config, portletContext, portletDD, portletAppDD)
@@ -156,7 +156,7 @@
String applicationId = getContextPath(servletContext);
if (!portletContexts.containsKey(applicationId)) {
- PortletAppDD portletAppDD = PortletDescriptorRegistry.getRegistry()
+ PortletApp portletAppDD = PortletDescriptorRegistry.getRegistry()
.getPortletAppDD(servletContext);
PortletContextImpl portletContext = new PortletContextImpl(
@@ -220,7 +220,7 @@
return (InternalPortletConfig) portletConfigs.get(lookup);
}
- public PortletDD getPortletDescriptor(String applicationId, String portletName) {
+ public Portlet getPortletDescriptor(String applicationId, String portletName) {
InternalPortletConfig ipc = (InternalPortletConfig) portletConfigs.get(applicationId + "/" + portletName);
if (ipc != null) {
return ipc.getPortletDefinition();
@@ -230,7 +230,7 @@
}
- public PortletAppDD getPortletApplicationDescriptor(String applicationId) throws PortletContainerException {
+ public PortletApp getPortletApplicationDescriptor(String applicationId) throws PortletContainerException {
InternalPortletContext ipc = (InternalPortletContext) portletContexts.get(applicationId);
if (ipc != null) {
return ipc.getPortletApplicationDefinition();
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java Fri Apr 11 02:37:29 2008
@@ -32,7 +32,6 @@
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.internal.InternalPortletConfig;
import org.apache.pluto.internal.InternalPortletContext;
import org.apache.pluto.internal.InternalPortletRequest;
@@ -119,7 +118,7 @@
throw new ServletException(ex);
}
- PortletDD portletDD = portletConfig.getPortletDefinition();
+ org.apache.pluto.om.portlet.Portlet portletDD = portletConfig.getPortletDefinition();
// Create and initialize the portlet wrapped in the servlet.
try {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletConfig.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletConfig.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletConfig.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletConfig.java Fri Apr 11 02:37:29 2008
@@ -19,13 +19,13 @@
import javax.portlet.PortletConfig;
import javax.servlet.ServletConfig;
-import org.apache.pluto.descriptors.portlet.PortletDD;
+import org.apache.pluto.om.portlet.Portlet;
public interface InternalPortletConfig extends PortletConfig {
public ServletConfig getServletConfig();
- public PortletDD getPortletDefinition();
+ public Portlet getPortletDefinition();
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletContext.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletContext.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletContext.java Fri Apr 11 02:37:29 2008
@@ -19,7 +19,7 @@
import javax.portlet.PortletContext;
import javax.servlet.ServletContext;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
+import org.apache.pluto.om.portlet.PortletApp;
public interface InternalPortletContext extends PortletContext {
@@ -39,7 +39,7 @@
*
* @return application config
*/
- public PortletAppDD getPortletApplicationDefinition();
+ public PortletApp getPortletApplicationDefinition();
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java Fri Apr 11 02:37:29 2008
@@ -20,6 +20,7 @@
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.descriptors.portlet.PortletAppDD;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
+import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.util.StringManager;
import javax.servlet.ServletContext;
@@ -115,14 +116,14 @@
* @return The portlet application deployment descriptor.
* @throws PortletContainerException if the descriptor can not be found or parsed
*/
- public PortletAppDD getPortletAppDD(ServletContext servletContext)
+ public PortletApp getPortletAppDD(ServletContext servletContext)
throws PortletContainerException {
- PortletAppDD portletAppDD = (PortletAppDD) cache.get(servletContext);
- if (portletAppDD == null) {
- portletAppDD = createDefinition(servletContext);
- cache.put(servletContext, portletAppDD);
+ PortletApp portletApp = (PortletApp) cache.get(servletContext);
+ if (portletApp == null) {
+ portletApp = createDefinition(servletContext);
+ cache.put(servletContext, portletApp);
}
- return portletAppDD;
+ return portletApp;
}
@@ -135,19 +136,19 @@
* @return the Portlet Application Deployment Descriptor.
* @throws PortletContainerException
*/
- private PortletAppDD createDefinition(ServletContext servletContext)
+ private PortletApp createDefinition(ServletContext servletContext)
throws PortletContainerException {
- PortletAppDD portletAppDD = null;
+ PortletApp portletApp = null;
try {
InputStream in = servletContext.getResourceAsStream(PORTLET_XML);
- portletAppDD = portletDDService.read(in);
+ portletApp = portletDDService.read(in);
} catch (IOException ex) {
throw new PortletContainerException(EXCEPTIONS.getString(
"error.context.descriptor.load",
new String[] { servletContext.getServletContextName() }),
ex);
}
- return portletAppDD;
+ return portletApp;
}
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/PortletEntity.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/PortletEntity.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/PortletEntity.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/PortletEntity.java Fri Apr 11 02:37:29 2008
@@ -21,6 +21,7 @@
import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.descriptors.servlet.ServletDD;
+import org.apache.pluto.om.portlet.Portlet;
/**
* The PortletEntity encapsulates all data pertaining to a single portlet
@@ -72,7 +73,7 @@
* Returns the portlet description. The return value cannot be NULL.
* @return the portlet description.
*/
- public PortletDD getPortletDefinition();
+ public Portlet getPortletDefinition();
/**
* Returns the preferences validator instance for this portlet.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java Fri Apr 11 02:37:29 2008
@@ -37,10 +37,10 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
-import org.apache.pluto.descriptors.portlet.SupportsDD;
import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.Supports;
import org.apache.pluto.spi.PortletURLListener;
import org.apache.pluto.spi.PortletURLProvider;
import org.apache.pluto.util.StringManager;
@@ -213,7 +213,7 @@
}
try {
- PortletAppDD portletAppDD = container.getPortletApplicationDescriptor(internalPortletWindow.getContextPath());
+ PortletApp portletAppDD = container.getPortletApplicationDescriptor(internalPortletWindow.getContextPath());
// container.getOptionalContainerServices().getPortletRegistryService().getRegisteredPortletApplications()
// PortletAppDD portletAppDD = container.getPortletApplicationDescriptor( );
portletURLFilterListener.callListener(portletAppDD,this,isAction,isResourceServing);
@@ -284,11 +284,11 @@
return true;
}
- PortletDD dd = internalPortletWindow.getPortletEntity()
+ Portlet dd = internalPortletWindow.getPortletEntity()
.getPortletDefinition();
Iterator supports = dd.getSupports().iterator();
while(supports.hasNext()) {
- SupportsDD support = (SupportsDD)supports.next();
+ Supports support = (Supports)supports.next();
if (support.getPortletModes() != null){
Iterator modes = support.getPortletModes().iterator();
while(modes.hasNext()) {
@@ -356,7 +356,7 @@
}
try {
- PortletAppDD portletAppDD = container.getPortletApplicationDescriptor(internalPortletWindow.getContextPath());
+ PortletApp portletAppDD = container.getPortletApplicationDescriptor(internalPortletWindow.getContextPath());
// container.getOptionalContainerServices().getPortletRegistryService().getRegisteredPortletApplications()
// PortletAppDD portletAppDD = container.getPortletApplicationDescriptor( );
portletURLFilterListener.callListener(portletAppDD,this,isAction,isResourceServing);
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java Fri Apr 11 02:37:29 2008
@@ -32,11 +32,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainer;
-import org.apache.pluto.descriptors.portlet.ExpirationCacheDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
-import org.apache.pluto.descriptors.portlet.SupportsDD;
import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.internal.PortletEntity;
+import org.apache.pluto.om.portlet.ExpirationCache;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.Supports;
import org.apache.pluto.util.StringManager;
public class MimeResponseImpl extends PortletResponseImpl implements
@@ -113,9 +113,9 @@
servletResponse);
this.cacheControl = new CacheControlImpl();
PortletEntity portletEntity = internalPortletWindow.getPortletEntity();
- PortletDD portletDefinition = portletEntity.getPortletDefinition();
- ExpirationCacheDD expirationCacheDD = portletDefinition
- .getExpirationCacheDD();
+ Portlet portletDefinition = portletEntity.getPortletDefinition();
+ ExpirationCache expirationCacheDD = portletDefinition
+ .getExpirationCache();
if (expirationCacheDD != null) {
int expirationTime = expirationCacheDD.getExpirationTime();
this.setProperty(EXPIRATION_CACHE, String.valueOf(expirationTime));
@@ -362,12 +362,12 @@
protected boolean isValidContentType(String contentType) {
boolean valid = false;
- PortletDD portletDD = getInternalPortletWindow().getPortletEntity()
+ Portlet portletDD = getInternalPortletWindow().getPortletEntity()
.getPortletDefinition();
for (Iterator it = portletDD.getSupports().iterator();
!valid && it.hasNext(); ) {
- SupportsDD supportsDD = (SupportsDD) it.next();
+ Supports supportsDD = (Supports) it.next();
String supportedType = supportsDD.getMimeType();
// Content type is supported by an exact match.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java Fri Apr 11 02:37:29 2008
@@ -36,10 +36,11 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.internal.InternalPortletConfig;
+import org.apache.pluto.om.common.InitParam;
+import org.apache.pluto.om.portlet.ContainerRuntimeOption;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.descriptors.common.InitParamDD;
-import org.apache.pluto.descriptors.portlet.ContainerRuntimeOptionDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
public class PortletConfigImpl implements PortletConfig, InternalPortletConfig {
@@ -58,19 +59,19 @@
/**
* The portlet descriptor.
*/
- protected PortletDD portletDD;
+ protected Portlet portletDD;
/**
* The portlet application descriptor.
*/
- private PortletAppDD portletAppDD;
+ private PortletApp portletAppDD;
private ResourceBundleFactory bundles;
public PortletConfigImpl(ServletConfig servletConfig,
PortletContext portletContext,
- PortletDD portletDD,
- PortletAppDD portletAppDD) {
+ Portlet portletDD,
+ PortletApp portletAppDD) {
this.servletConfig = servletConfig;
this.portletContext = portletContext;
this.portletDD = portletDD;
@@ -100,9 +101,9 @@
throw new IllegalArgumentException("Parameter name == null");
}
- Iterator<InitParamDD> parms = portletDD.getInitParams().iterator();
+ Iterator<InitParam> parms = portletDD.getInitParams().iterator();
while(parms.hasNext()) {
- InitParamDD param = parms.next();
+ InitParam param = parms.next();
if (param.getParamName().equals(name)) {
return param.getParamValue();
}
@@ -112,8 +113,8 @@
public Enumeration<String> getInitParameterNames() {
return new java.util.Enumeration<String>() {
- private Iterator<InitParamDD> iterator =
- new ArrayList<InitParamDD>(portletDD.getInitParams()).iterator();
+ private Iterator<InitParam> iterator =
+ new ArrayList<InitParam>(portletDD.getInitParams()).iterator();
public boolean hasMoreElements() {
return iterator.hasNext();
@@ -133,7 +134,7 @@
return servletConfig;
}
- public PortletDD getPortletDefinition() {
+ public Portlet getPortletDefinition() {
return portletDD;
}
// --------------------------------------------------------------------------------------------
@@ -207,7 +208,7 @@
public Map<String, String[]> getApplicationRuntimeOptions() {
Map<String, String[]> resultMap = new HashMap<String, String[]>();
if (portletAppDD.getContainerRuntimeOption() != null){
- for (ContainerRuntimeOptionDD option : portletAppDD.getContainerRuntimeOption()) {
+ for (ContainerRuntimeOption option : portletAppDD.getContainerRuntimeOption()) {
if (Configuration.getSupportedContainerRuntimeOptions().contains(option.getName())){
List<String> values = option.getValue();
String [] tempValues = new String[values.size()];
@@ -224,7 +225,7 @@
public Map<String, String[]> getPortletRuntimeOptions() {
Map<String, String[]> resultMap = new HashMap<String, String[]>();
if (portletDD.getContainerRuntimeOption() != null) {
- for (ContainerRuntimeOptionDD option : portletDD.getContainerRuntimeOption()) {
+ for (ContainerRuntimeOption option : portletDD.getContainerRuntimeOption()) {
if (Configuration.getSupportedContainerRuntimeOptions().contains(option.getName())){
List<String> values = option.getValue();
String [] tempValues = new String[values.size()];
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java Fri Apr 11 02:37:29 2008
@@ -33,10 +33,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.descriptors.portlet.ContainerRuntimeOptionDD;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.internal.InternalPortletContext;
+import org.apache.pluto.om.portlet.ContainerRuntimeOption;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
/**
* Pluto's Portlet Context Implementation. This class implements the
@@ -58,13 +58,13 @@
/** Portlet Descriptor */
- private PortletDD portletDD = null;
+ private Portlet portletDD = null;
private final String applicationId;
private String applicationName;
- private final PortletAppDD portletAppDD;
+ private final PortletApp portletAppDD;
private final ServletContext servletContext;
private ClassLoader contextClassLoader;
@@ -78,7 +78,7 @@
*/
public PortletContextImpl(String portletApplicationId,
ServletContext servletContext,
- PortletAppDD portletAppDD) {
+ PortletApp portletAppDD) {
this.servletContext = servletContext;
this.portletAppDD = portletAppDD;
this.applicationId = portletApplicationId;
@@ -284,7 +284,7 @@
return servletContext;
}
- public PortletAppDD getPortletApplicationDefinition() {
+ public PortletApp getPortletApplicationDefinition() {
return portletAppDD;
}
@@ -292,7 +292,7 @@
public Map<String, String[]> getApplicationRuntimeOptions() {
Map<String, String[]> resultMap = new HashMap<String, String[]>();
if (portletAppDD.getContainerRuntimeOption() != null){
- for (ContainerRuntimeOptionDD option : portletAppDD.getContainerRuntimeOption()) {
+ for (ContainerRuntimeOption option : portletAppDD.getContainerRuntimeOption()) {
if (Configuration.getSupportedContainerRuntimeOptions().contains(option.getName())){
List<String> values = option.getValue();
String [] tempValues = new String[values.size()];
@@ -309,7 +309,7 @@
public Map<String, String[]> getPortletRuntimeOptions() {
Map<String, String[]> resultMap = new HashMap<String, String[]>();
if (portletDD.getContainerRuntimeOption() != null) {
- for (ContainerRuntimeOptionDD option : portletDD.getContainerRuntimeOption()) {
+ for (ContainerRuntimeOption option : portletDD.getContainerRuntimeOption()) {
if (Configuration.getSupportedContainerRuntimeOptions().contains(option.getName())){
List<String> values = option.getValue();
String [] tempValues = new String[values.size()];
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java Fri Apr 11 02:37:29 2008
@@ -24,10 +24,11 @@
import org.apache.pluto.internal.PortletDescriptorRegistry;
import org.apache.pluto.internal.PortletEntity;
import org.apache.pluto.internal.PreferencesValidatorRegistry;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletPreference;
+import org.apache.pluto.om.portlet.PortletPreferences;
import org.apache.pluto.descriptors.portlet.PortletDD;
-import org.apache.pluto.descriptors.portlet.PortletPreferenceDD;
-import org.apache.pluto.descriptors.portlet.PortletPreferencesDD;
import org.apache.pluto.descriptors.servlet.ServletDD;
import javax.portlet.PreferencesValidator;
@@ -118,14 +119,14 @@
*/
public InternalPortletPreference[] getDefaultPreferences() {
if (defaultPreferences == null) {
- PortletDD portletDD = getPortletDefinition();
- PortletPreferencesDD prefsDD = portletDD.getPortletPreferences();
+ Portlet portletDD = getPortletDefinition();
+ PortletPreferences prefsDD = portletDD.getPortletPreferences();
if (prefsDD != null) {
List prefs = new ArrayList();
if (prefsDD.getPortletPreferences() != null){
for (Iterator it = prefsDD.getPortletPreferences().iterator();
it.hasNext(); ) {
- PortletPreferenceDD prefDD = (PortletPreferenceDD) it.next();
+ PortletPreference prefDD = (PortletPreference) it.next();
String[] values = null;
if (prefDD.getValues()!=null){
if (prefDD.getValues().size() > 0) {
@@ -186,7 +187,7 @@
// Load PortletAppDD and find out the portlet definition.
try {
- PortletAppDD appDD = PortletDescriptorRegistry.getRegistry()
+ PortletApp appDD = PortletDescriptorRegistry.getRegistry()
.getPortletAppDD(crossContext);
for (Iterator it = appDD.getPortlets().iterator(); it.hasNext(); ) {
PortletDD portletDD = (PortletDD) it.next();
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Fri Apr 11 02:37:29 2008
@@ -57,14 +57,14 @@
import org.apache.pluto.OptionalContainerServices;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.descriptors.common.SecurityRoleRefDD;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
-import org.apache.pluto.descriptors.portlet.SupportsDD;
-import org.apache.pluto.descriptors.portlet.UserAttributeDD;
import org.apache.pluto.internal.InternalPortletRequest;
import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.internal.PortletEntity;
+import org.apache.pluto.om.common.SecurityRoleRef;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.Supports;
+import org.apache.pluto.om.portlet.UserAttribute;
import org.apache.pluto.spi.PortletURLProvider;
import org.apache.pluto.spi.optional.PortletRegistryService;
import org.apache.pluto.spi.optional.UserInfoService;
@@ -403,12 +403,12 @@
*/
public boolean isUserInRole(String roleName) {
PortletEntity entity = internalPortletWindow.getPortletEntity();
- PortletDD def = entity.getPortletDefinition();
+ Portlet def = entity.getPortletDefinition();
- SecurityRoleRefDD ref = null;
+ SecurityRoleRef ref = null;
Iterator refs = def.getSecurityRoleRefs().iterator();
while (refs.hasNext()) {
- SecurityRoleRefDD r = (SecurityRoleRefDD) refs.next();
+ SecurityRoleRef r = (SecurityRoleRef) refs.next();
if (r.getRoleName().equals(roleName)) {
ref = r;
break;
@@ -493,11 +493,11 @@
}
final PortletRegistryService portletRegistryService = optionalContainerServices.getPortletRegistryService();
- final PortletAppDD dd = portletRegistryService.getPortletApplicationDescriptor(internalPortletWindow.getContextPath());
+ final PortletApp dd = portletRegistryService.getPortletApplicationDescriptor(internalPortletWindow.getContextPath());
Iterator i = dd.getUserAttribute().iterator();
while(i.hasNext()) {
- UserAttributeDD udd = (UserAttributeDD)i.next();
+ UserAttribute udd = (UserAttribute)i.next();
userInfoMap.put(udd.getName(), allMap.get(udd.getName()));
}
} catch (PortletContainerException e) {
@@ -621,10 +621,10 @@
public Enumeration getResponseContentTypes() {
if (contentTypes == null) {
contentTypes = new Vector();
- PortletDD dd = internalPortletWindow.getPortletEntity().getPortletDefinition();
+ Portlet dd = internalPortletWindow.getPortletEntity().getPortletDefinition();
Iterator supports = dd.getSupports().iterator();
while (supports.hasNext()) {
- SupportsDD sup = (SupportsDD) supports.next();
+ Supports sup = (Supports) supports.next();
contentTypes.add(sup.getMimeType());
}
if (contentTypes.size() < 1) {
@@ -760,12 +760,12 @@
return true;
}
- PortletDD dd = internalPortletWindow.getPortletEntity()
+ Portlet dd = internalPortletWindow.getPortletEntity()
.getPortletDefinition();
Iterator mimes = dd.getSupports().iterator();
while (mimes.hasNext()) {
- Iterator modes = ((SupportsDD) mimes.next()).getPortletModes().iterator();
+ Iterator modes = ((Supports) mimes.next()).getPortletModes().iterator();
while (modes.hasNext()) {
String m = (String) modes.next();
if (m.equals(mode.toString())) {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java Fri Apr 11 02:37:29 2008
@@ -26,8 +26,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletWindow;
import org.apache.pluto.core.ContainerInvocation;
-import org.apache.pluto.descriptors.portlet.PortletDD;
-import org.apache.pluto.descriptors.portlet.PortletInfoDD;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletInfo;
import org.apache.pluto.spi.optional.PortletInfoService;
import org.apache.pluto.util.StringManager;
@@ -60,13 +60,13 @@
*/
private String bundleName;
- public ResourceBundleFactory(PortletDD dd) {
+ public ResourceBundleFactory(Portlet dd) {
bundleName = dd.getResourceBundle();
if(LOG.isDebugEnabled()) {
LOG.debug("Resource Bundle Created: "+bundleName);
}
- PortletInfoDD info = dd.getPortletInfo();
+ PortletInfo info = dd.getPortletInfo();
PortletInfoService infoService = getPortletInfoService();
PortletWindow window = getWindow();
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java Fri Apr 11 02:37:29 2008
@@ -44,9 +44,9 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.descriptors.portlet.PortletDD;
-import org.apache.pluto.descriptors.portlet.SupportsDD;
import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.Supports;
import org.apache.pluto.spi.EventProvider;
import org.apache.pluto.spi.PortalCallbackService;
import org.apache.pluto.spi.ResourceURLProvider;
@@ -321,12 +321,12 @@
}
protected boolean isPortletModeAllowedByPortlet(PortletMode mode) {
- PortletDD dd = getInternalPortletWindow().getPortletEntity()
+ Portlet dd = getInternalPortletWindow().getPortletEntity()
.getPortletDefinition();
Iterator supports = dd.getSupports().iterator();
while(supports.hasNext()) {
- SupportsDD sup = (SupportsDD)supports.next();
+ Supports sup = (Supports)supports.next();
List<String> portletModes = sup.getPortletModes();
if (portletModes == null)
return false;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java Fri Apr 11 02:37:29 2008
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
+import org.apache.pluto.om.portlet.PortletApp;
import org.w3c.dom.Element;
/**
@@ -96,7 +96,7 @@
* Returns the FilterManager, this is used to process the filter.
* @return FilterManager
*/
- public FilterManager getFilterManager(PortletAppDD portletAppDD, String portletName, String lifeCycle);
+ public FilterManager getFilterManager(PortletApp portletAppDD, String portletName, String lifeCycle);
/**
* Returns the PortletURLListener which calls the Filter for the URL.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLListener.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLListener.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLListener.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLListener.java Fri Apr 11 02:37:29 2008
@@ -18,8 +18,8 @@
import javax.portlet.BaseURL;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
+import org.apache.pluto.om.portlet.PortletApp;
public interface PortletURLListener {
- public void callListener(PortletAppDD portletAppDD, BaseURL baseURL, boolean isAction, boolean isResource);
+ public void callListener(PortletApp portletAppDD, BaseURL baseURL, boolean isAction, boolean isResource);
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java Fri Apr 11 02:37:29 2008
@@ -17,7 +17,7 @@
*/
package org.apache.pluto.spi.optional;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
+import org.apache.pluto.om.portlet.PortletApp;
/**
* Encapsulation of event information.
@@ -27,7 +27,7 @@
public class PortletRegistryEvent {
private String applicationId;
- private PortletAppDD portletApplicationDescriptor;
+ private PortletApp portletApplicationDescriptor;
public String getApplicationId() {
@@ -38,11 +38,11 @@
this.applicationId = applicationId;
}
- public PortletAppDD getPortletApplicationDescriptor() {
+ public PortletApp getPortletApplicationDescriptor() {
return portletApplicationDescriptor;
}
- public void setPortletApplicationDescriptor(PortletAppDD portletApplicationDescriptor) {
+ public void setPortletApplicationDescriptor(PortletApp portletApplicationDescriptor) {
this.portletApplicationDescriptor = portletApplicationDescriptor;
}
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java Fri Apr 11 02:37:29 2008
@@ -17,8 +17,8 @@
*/
package org.apache.pluto.spi.optional;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.PortletContainerException;
import javax.portlet.PortletContext;
@@ -68,7 +68,7 @@
* @throws PortletContainerException if the descriptor
* can not be found or if the portlet.xml can not be parsed.
*/
- PortletAppDD getPortletApplicationDescriptor(String name)
+ PortletApp getPortletApplicationDescriptor(String name)
throws PortletContainerException;
/**
@@ -89,7 +89,7 @@
* @return descriptor
* @throws PortletContainerException if unexpected error
*/
- PortletDD getPortletDescriptor(String applicationId, String portletName)
+ Portlet getPortletDescriptor(String applicationId, String portletName)
throws PortletContainerException;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java Fri Apr 11 02:37:29 2008
@@ -16,6 +16,8 @@
*/
package org.apache.pluto.internal.impl;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletInfo;
import org.apache.pluto.util.PlutoTestCase;
import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.descriptors.portlet.PortletInfoDD;
@@ -32,14 +34,14 @@
*/
public class ResourceBundleFactoryTest extends PlutoTestCase {
- private PortletDD validDD;
+ private Portlet validDD;
public void setUp() throws Exception {
super.setUp();
validDD = new PortletDD();
- PortletInfoDD info = new PortletInfoDD();
+ PortletInfo info = new PortletInfoDD();
info.setTitle("Info Title");
info.setShortTitle("Info Short Title");
info.setKeywords("Info Keywords");
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/pom.xml?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/pom.xml (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/pom.xml Fri Apr 11 02:37:29 2008
@@ -63,6 +63,12 @@
<version>${jaxb.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-container-api</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DescriptionDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DescriptionDD.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DescriptionDD.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DescriptionDD.java Fri Apr 11 02:37:29 2008
@@ -18,24 +18,38 @@
import java.util.Locale;
-public class DescriptionDD {
+import org.apache.pluto.om.common.Description;
+
+public class DescriptionDD implements Description {
private String description;
private String lang = Locale.ENGLISH.toString();
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.Description#getDescription()
+ */
public String getDescription() {
return description;
}
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.Description#setDescription(java.lang.String)
+ */
public void setDescription(String description) {
this.description = description;
}
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.Description#getLang()
+ */
public String getLang() {
return lang;
}
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.Description#setLang(java.lang.String)
+ */
public void setLang(String lang) {
this.lang = lang;
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DisplayNameDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DisplayNameDD.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DisplayNameDD.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DisplayNameDD.java Fri Apr 11 02:37:29 2008
@@ -18,27 +18,41 @@
import java.util.Locale;
+import org.apache.pluto.om.common.DisplayName;
+
/**
*
* @since 1.1.0
*/
-public class DisplayNameDD {
+public class DisplayNameDD implements DisplayName {
private String displayName;
private String lang = Locale.ENGLISH.toString();
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.DisplayName#getDisplayName()
+ */
public String getDisplayName() {
return displayName;
}
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.DisplayName#setDisplayName(java.lang.String)
+ */
public void setDisplayName(String displayName) {
this.displayName = displayName;
}
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.DisplayName#getLang()
+ */
public String getLang() {
return lang;
}
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.DisplayName#setLang(java.lang.String)
+ */
public void setLang(String lang) {
this.lang = lang;
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/IconDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/IconDD.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/IconDD.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/IconDD.java Fri Apr 11 02:37:29 2008
@@ -16,13 +16,15 @@
*/
package org.apache.pluto.descriptors.common;
+import org.apache.pluto.om.common.Icon;
+
/**
* Resource Icon configuration.
*
* @version $Id: IconDD.java 157038 2005-03-11 03:44:40Z ddewolf $
* @since Feb 28, 2005
*/
-public class IconDD{
+public class IconDD implements Icon{
/** The large icon uri. */
private String largeIcon;
@@ -37,34 +39,30 @@
}
- /**
- * Retrieve the large icon uri.
- * @return the uri to the large icon (relative to the context path).
- */
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.Icon#getLargeIcon()
+ */
public String getLargeIcon() {
return largeIcon;
}
- /**
- * Set the large icon uri.
- * @param largeIcon the relative path to the icon resource.
- */
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.Icon#setLargeIcon(java.lang.String)
+ */
public void setLargeIcon(String largeIcon) {
this.largeIcon = largeIcon;
}
- /**
- * Retrieve the small icon uri.
- * @return the uri to the small icon (relative to the context path).
- */
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.Icon#getSmallIcon()
+ */
public String getSmallIcon() {
return smallIcon;
}
- /**
- * Set the small Icon uri.
- * @param smallIcon the relative path to the icon resource.
- */
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.Icon#setSmallIcon(java.lang.String)
+ */
public void setSmallIcon(String smallIcon) {
this.smallIcon = smallIcon;
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java Fri Apr 11 02:37:29 2008
@@ -27,7 +27,8 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.pluto.descriptors.portlet.PortletDD;
+import org.apache.pluto.om.common.InitParam;
+import org.apache.pluto.om.portlet.Portlet;
/**
* Initialization Parameter configuration.
@@ -69,14 +70,14 @@
"paramValue", "paramValue1",
"descriptions", "descriptions1"
})
-public class InitParamDD {
+public class InitParamDD implements InitParam {
/** The description of the parameter. */
@XmlElement(name = "description")
private String description;
/** The description of the parameter. */
- @XmlElement(name = "description", namespace = PortletDD.QNAME_JSR168)
+ @XmlElement(name = "description", namespace = Portlet.QNAME_JSR168)
private String description1;
/** The description list. */
@@ -84,7 +85,7 @@
private List<String> descriptions;
/** The description list. */
- @XmlElement(name = "descriptions", namespace = PortletDD.QNAME_JSR168)
+ @XmlElement(name = "descriptions", namespace = Portlet.QNAME_JSR168)
private List descriptions1;
/** The name of the parameter. */
@@ -92,7 +93,7 @@
private String paramName;
/** The name of the parameter. */
- @XmlElement(name = "name", namespace = PortletDD.QNAME_JSR168)
+ @XmlElement(name = "name", namespace = Portlet.QNAME_JSR168)
private String paramName1;
/** The value of the parameter. */
@@ -100,7 +101,7 @@
private String paramValue;
/** The value of the parameter. */
- @XmlElement(name = "value", namespace = PortletDD.QNAME_JSR168)
+ @XmlElement(name = "value", namespace = Portlet.QNAME_JSR168)
private String paramValue1;
@@ -112,77 +113,69 @@
}
- /**
- * Retrieve the name of the parameter.
- * @return
- */
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.InitParam#getParamName()
+ */
public String getParamName() {
if (paramName!= null)
return paramName;
return paramName1;
}
- /**
- * Set the name of the parameter.
- * @param paramName
- */
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.InitParam#setParamName(java.lang.String)
+ */
public void setParamName(String paramName) {
this.paramName = paramName;
this.paramName1 = paramName;
}
- /**
- * Get the name of the parameter.
- * @return
- */
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.InitParam#getParamValue()
+ */
public String getParamValue() {
if (paramValue != null)
return paramValue;
return paramValue1;
}
- /**
- * Set the value of the parameter.
- * @param paramValue
- */
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.InitParam#setParamValue(java.lang.String)
+ */
public void setParamValue(String paramValue) {
this.paramValue = paramValue;
this.paramValue1 = paramValue;
}
- /**
- * Retrieve the description.
- * @return
- */
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.InitParam#getDescription()
+ */
public String getDescription() {
if (description != null)
return description;
return description1;
}
- /**
- * Set the description of the parameter.
- * @param description
- */
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.InitParam#setDescription(java.lang.String)
+ */
public void setDescription(String description) {
this.description = description;
this.description1 = description;
}
- /**
- * Retrieve the description list.
- * @return
- */
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.InitParam#getDescriptions()
+ */
public List getDescriptions() {
if (descriptions != null)
return descriptions;
return descriptions1;
}
- /**
- * Set the description list.
- * @param description
- */
+ /* (non-Javadoc)
+ * @see org.apache.pluto.descriptors.common.InitParam#setDescriptions(java.util.List)
+ */
public void setDescriptions(List<String> descriptions) {
this.descriptions = descriptions;
this.descriptions1 = descriptions;