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 as...@apache.org on 2019/04/11 15:57:02 UTC
[portals-pluto] branch master updated: PLUTO-771 Consolidate the
demonstration portlets into a "/demo" sub-directory (Consistent java
package naming)
This is an automated email from the ASF dual-hosted git repository.
asfgriff pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/portals-pluto.git
The following commit(s) were added to refs/heads/master by this push:
new 9f2c66f PLUTO-771 Consolidate the demonstration portlets into a "/demo" sub-directory (Consistent java package naming)
9f2c66f is described below
commit 9f2c66f3c4d194aae0b985a6552c1b9b985801a8
Author: Neil Griffin <ne...@gmail.com>
AuthorDate: Thu Apr 11 11:56:42 2019 -0400
PLUTO-771 Consolidate the demonstration portlets into a "/demo" sub-directory (Consistent java package naming)
---
.../jsp/controller/ApplicantActionController.java | 6 ++---
.../jsp/controller/ApplicantRenderController.java | 8 +++----
.../controller/ApplicantResourceController.java | 8 +++----
.../cdi/jsp/controller/AttachmentManager.java | 4 ++--
.../cdi/jsp/controller/HelpRenderController.java | 2 +-
.../controller/PreferencesActionController.java | 4 ++--
.../controller/PreferencesRenderController.java | 4 ++--
.../jsp/controller/TermsResourceController.java | 2 +-
.../cdi/jsp/convert/DateParamConverter.java | 2 +-
.../jsp/convert/DateParamConverterProvider.java | 2 +-
.../applicant/mvcbean/cdi/jsp/dto/Applicant.java | 2 +-
.../applicant/mvcbean/cdi/jsp/dto/Attachment.java | 2 +-
.../demo}/applicant/mvcbean/cdi/jsp/dto/City.java | 2 +-
.../applicant/mvcbean/cdi/jsp/dto/Preferences.java | 2 +-
.../applicant/mvcbean/cdi/jsp/dto/Province.java | 2 +-
.../applicant/mvcbean/cdi/jsp/el/Converter.java | 4 ++--
.../applicant/mvcbean/cdi/jsp/el/Expression.java | 2 +-
.../demo}/applicant/mvcbean/cdi/jsp/el/Fields.java | 2 +-
.../mvcbean/cdi/jsp/event/MvcEventListener.java | 2 +-
.../mvcbean/cdi/jsp/portlet/ApplicantPortlet.java | 2 +-
.../mvcbean/cdi/jsp/portlet/PortletContainer.java | 2 +-
.../mvcbean/cdi/jsp/service/CityService.java | 4 ++--
.../mvcbean/cdi/jsp/service/ProvinceService.java | 4 ++--
.../cdi/jsp/service/mock/CityServiceMockImpl.java | 8 +++----
.../jsp/service/mock/ProvinceServiceMockImpl.java | 6 ++---
.../cdi/jsp/servlet/AttachmentSessionListener.java | 2 +-
.../src/main/resources/log4j.properties | 2 +-
.../controller/ApplicantActionController.java | 6 ++---
.../controller/ApplicantRenderController.java | 8 +++----
.../controller/ApplicantResourceController.java | 8 +++----
.../thymeleaf/controller/AttachmentManager.java | 4 ++--
.../cdi/thymeleaf/controller/ControllerUtil.java | 2 +-
.../thymeleaf/controller/HelpRenderController.java | 2 +-
.../controller/PreferencesActionController.java | 4 ++--
.../controller/PreferencesRenderController.java | 4 ++--
.../controller/TermsResourceController.java | 2 +-
.../cdi/thymeleaf/convert/DateParamConverter.java | 2 +-
.../convert/DateParamConverterProvider.java | 2 +-
.../mvcbean/cdi/thymeleaf/dto/Applicant.java | 2 +-
.../mvcbean/cdi/thymeleaf/dto/Attachment.java | 2 +-
.../applicant/mvcbean/cdi/thymeleaf/dto/City.java | 2 +-
.../mvcbean/cdi/thymeleaf/dto/Preferences.java | 2 +-
.../mvcbean/cdi/thymeleaf/dto/Province.java | 2 +-
.../mvcbean/cdi/thymeleaf/el/Converter.java | 4 ++--
.../mvcbean/cdi/thymeleaf/el/Expression.java | 2 +-
.../applicant/mvcbean/cdi/thymeleaf/el/Fields.java | 2 +-
.../cdi/thymeleaf/event/MvcEventListener.java | 2 +-
.../cdi/thymeleaf/portlet/ApplicantPortlet.java | 2 +-
.../cdi/thymeleaf/portlet/PortletContainer.java | 2 +-
.../mvcbean/cdi/thymeleaf/service/CityService.java | 4 ++--
.../cdi/thymeleaf/service/ProvinceService.java | 4 ++--
.../service/mock/CityServiceMockImpl.java | 8 +++----
.../service/mock/ProvinceServiceMockImpl.java | 6 ++---
.../servlet/AttachmentSessionListener.java | 2 +-
.../src/main/resources/log4j.properties | 2 +-
.../pluto/demo/chat}/CSSIncludingHeaderMethod.java | 2 +-
.../portals/pluto/demo/chat}/ChatHistory.java | 2 +-
.../apache/portals/pluto/demo/chat}/ChatRoom.java | 2 +-
.../portals/pluto/demo/chat}/ChatRoomListener.java | 2 +-
.../portals/pluto/demo/chat}/ChatRoomRunner.java | 2 +-
.../portals/pluto/demo/chat}/HelloWorldImage.java | 2 +-
.../portals/pluto/demo/chat}/HelloWorldRender.java | 2 +-
.../apache/portals/pluto/demo/chat}/Help.java | 2 +-
.../apache/portals/pluto/demo/chat}/NameBean.java | 2 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
.../portals/pluto/demo/hub}/ColorSelPortlet.java | 16 ++++++-------
.../apache/portals/pluto/demo/hub}/Constants.java | 2 +-
.../portals/pluto/demo/hub}/ImageSelPortlet.java | 10 ++++-----
.../portals/pluto/demo/hub}/MessageBoxPortlet.java | 10 ++++-----
.../portals/pluto/demo/hub}/ParamTestPortlet.java | 4 ++--
.../pluto/demo/hub}/PartialActionPortlet.java | 4 ++--
.../portals/pluto/demo/hub}/ResourcePortlet.java | 12 +++++-----
.../src/main/resources/log4j.properties | 2 +-
.../src/main/resources/logging.properties | 2 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-csp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-ptp.jsp | 2 +-
.../v3annotated}/AppSessionRandomNumberBean.java | 2 +-
.../v3annotated}/ApplicationRandomNumberBean.java | 2 +-
.../demo/v3annotated}/AsyncCompleteBean.java | 2 +-
.../demo/v3annotated}/AsyncConstants.java | 2 +-
.../demo/v3annotated}/AsyncDialogBean.java | 2 +-
.../demo/v3annotated}/AsyncFilter.java | 2 +-
.../demo/v3annotated}/AsyncListener.java | 6 ++---
.../demo/v3annotated}/AsyncPortlet.java | 4 ++--
.../demo/v3annotated}/AsyncRunnable.java | 2 +-
.../v3annotated}/CSSIncludingHeaderMethod.java | 2 +-
.../demo/v3annotated}/HelloWorldImage.java | 2 +-
.../demo/v3annotated}/HelloWorldRender.java | 2 +-
.../{samples => pluto/demo/v3annotated}/Log.java | 2 +-
.../demo/v3annotated}/LoggingInterceptor.java | 2 +-
.../demo/v3annotated}/MultipartPortlet.java | 2 +-
.../demo/v3annotated}/NameBean.java | 2 +-
.../demo/v3annotated}/PathDisplay.java | 2 +-
.../demo/v3annotated}/PathDisplayServlet.java | 2 +-
.../demo/v3annotated}/PathInfoPortlet.java | 2 +-
.../PortletRequestRandomNumberBean.java | 2 +-
.../PortletSessionRandomNumberBean.java | 2 +-
.../demo/v3annotated}/RenderLink.java | 2 +-
.../demo/v3annotated}/RequestRandomNumberBean.java | 2 +-
.../demo/v3annotated}/SessionRandomNumberBean.java | 2 +-
.../src/main/resources/log4j.properties | 2 +-
.../src/main/resources/logging.properties | 2 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
.../src/main/webapp/WEB-INF/jsp/asyncDialog.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/pathinfo.jsp | 2 +-
.../portals/pluto/demo/v3}/ActEvtProxyServlet.java | 8 +++----
.../portals/pluto/demo/v3}/AuthSCPortlet.java | 4 ++--
.../portals/pluto/demo/v3}/ColorSelPortlet.java | 4 ++--
.../apache/portals/pluto/demo/v3}/Constants.java | 2 +-
.../portals/pluto/demo/v3}/DependencyPortlet.java | 2 +-
.../portals/pluto/demo/v3}/HeaderPortlet.java | 4 ++--
.../portals/pluto/demo/v3}/ImageSelPortlet.java | 10 ++++-----
.../apache/portals/pluto/demo/v3}/LongPortlet.java | 4 ++--
.../portals/pluto/demo/v3}/MessageBoxPortlet.java | 4 ++--
.../portals/pluto/demo/v3}/ParamTestPortlet.java | 4 ++--
.../apache/portals/pluto/demo/v3}/ParamUtil.java | 2 +-
.../pluto/demo/v3}/PortletConfigPortlet.java | 10 ++++-----
.../portals/pluto/demo/v3}/RedirectPortlet.java | 4 ++--
.../portals/pluto/demo/v3}/ResourcePortlet.java | 12 +++++-----
.../portals/pluto/demo/v3}/TagLibPortlet.java | 2 +-
.../portals/pluto/demo/v3}/TagLibTagsPortlet.java | 2 +-
.../apache/portals/pluto/demo/v3}/URLFilter.java | 2 +-
.../portals/pluto/demo/v3}/UrlAPTestPortlet.java | 4 ++--
.../portals/pluto/demo/v3}/UrlRPTestPortlet.java | 24 ++++++++++----------
.../portals/pluto/demo/v3}/UrlTestPortlet.java | 4 ++--
.../src/main/resources/log4j.properties | 2 +-
.../src/main/resources/logging.properties | 2 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
.../main/webapp/WEB-INF/jsp/dependencyDialog.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/tagLibBeans.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/tagLibDialog.jsp | 4 ++--
.../src/main/webapp/WEB-INF/jsp/tagLibObjects.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/tagLibTags.jsp | 2 +-
.../main/webapp/WEB-INF/jsp/tagLibTagsResource.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-ascp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-csp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-hdp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-long.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-pcp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-ptp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-rdp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-uaptp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-urptp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-utp.jsp | 2 +-
.../src/main/webapp/WEB-INF/portlet.xml | 26 +++++++++++-----------
146 files changed, 258 insertions(+), 258 deletions(-)
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/ApplicantActionController.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/ApplicantActionController.java
similarity index 93%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/ApplicantActionController.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/ApplicantActionController.java
index 1f4384d..4828cab 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/ApplicantActionController.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/ApplicantActionController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.controller;
import java.io.File;
import java.util.List;
@@ -37,8 +37,8 @@ import javax.ws.rs.BeanParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto.Applicant;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto.Attachment;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.Applicant;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.Attachment;
/**
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/ApplicantRenderController.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/ApplicantRenderController.java
similarity index 91%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/ApplicantRenderController.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/ApplicantRenderController.java
index dc630dc..48e93e4 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/ApplicantRenderController.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/ApplicantRenderController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.controller;
import java.util.List;
@@ -33,9 +33,9 @@ import javax.portlet.annotations.RenderMethod;
import javax.validation.executable.ExecutableType;
import javax.validation.executable.ValidateOnExecution;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto.Applicant;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto.Attachment;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.service.ProvinceService;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.Applicant;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.Attachment;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.service.ProvinceService;
/**
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/ApplicantResourceController.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/ApplicantResourceController.java
similarity index 94%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/ApplicantResourceController.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/ApplicantResourceController.java
index d7d8d2f..b637bd0 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/ApplicantResourceController.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/ApplicantResourceController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.controller;
import java.io.File;
import java.io.IOException;
@@ -38,9 +38,9 @@ import javax.validation.executable.ValidateOnExecution;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto.Attachment;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto.City;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.service.CityService;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.Attachment;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.City;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.service.CityService;
/**
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/AttachmentManager.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/AttachmentManager.java
similarity index 91%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/AttachmentManager.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/AttachmentManager.java
index dc915e3..78f3574 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/AttachmentManager.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/AttachmentManager.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.controller;
import java.io.File;
import java.util.ArrayList;
@@ -24,7 +24,7 @@ import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.servlet.ServletContext;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto.Attachment;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.Attachment;
/**
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/HelpRenderController.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/HelpRenderController.java
similarity index 93%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/HelpRenderController.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/HelpRenderController.java
index 7af8b9f..286581d 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/HelpRenderController.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/HelpRenderController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.controller;
import javax.enterprise.context.ApplicationScoped;
import javax.mvc.Controller;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/PreferencesActionController.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/PreferencesActionController.java
similarity index 96%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/PreferencesActionController.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/PreferencesActionController.java
index 9a28c6a..b06d0c8 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/PreferencesActionController.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/PreferencesActionController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.controller;
import java.util.Enumeration;
import java.util.ResourceBundle;
@@ -43,7 +43,7 @@ import javax.ws.rs.FormParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto.Preferences;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.Preferences;
/**
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/PreferencesRenderController.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/PreferencesRenderController.java
similarity index 91%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/PreferencesRenderController.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/PreferencesRenderController.java
index 86f3f37..318d088 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/PreferencesRenderController.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/PreferencesRenderController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.controller;
import java.util.Map;
@@ -28,7 +28,7 @@ import javax.portlet.annotations.RenderMethod;
import javax.validation.executable.ExecutableType;
import javax.validation.executable.ValidateOnExecution;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto.Preferences;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.Preferences;
/**
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/TermsResourceController.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/TermsResourceController.java
similarity index 97%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/TermsResourceController.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/TermsResourceController.java
index 7ffc850..6bf7c5b 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/controller/TermsResourceController.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/TermsResourceController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.controller;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/convert/DateParamConverter.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/convert/DateParamConverter.java
similarity index 95%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/convert/DateParamConverter.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/convert/DateParamConverter.java
index 4fc27d0..c78f784 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/convert/DateParamConverter.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/convert/DateParamConverter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.convert;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.convert;
import java.text.DateFormat;
import java.text.ParseException;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/convert/DateParamConverterProvider.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/convert/DateParamConverterProvider.java
similarity index 95%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/convert/DateParamConverterProvider.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/convert/DateParamConverterProvider.java
index 42be423..988e515 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/convert/DateParamConverterProvider.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/convert/DateParamConverterProvider.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.convert;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.convert;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/Applicant.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Applicant.java
similarity index 98%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/Applicant.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Applicant.java
index 94cccd1..12d3c8f 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/Applicant.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Applicant.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto;
import java.io.Serializable;
import java.util.Calendar;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/Attachment.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Attachment.java
similarity index 94%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/Attachment.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Attachment.java
index afd9b66..b1cfc29 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/Attachment.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Attachment.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto;
import java.io.File;
import java.io.Serializable;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/City.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/City.java
similarity index 96%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/City.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/City.java
index 848f061..f487cc9 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/City.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/City.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto;
import java.io.Serializable;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/Preferences.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Preferences.java
similarity index 94%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/Preferences.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Preferences.java
index acf3ca1..2cc1784 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/Preferences.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Preferences.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto;
import javax.validation.constraints.NotBlank;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/Province.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Province.java
similarity index 95%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/Province.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Province.java
index b2fbf6d..a87e7c5 100755
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/dto/Province.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Province.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto;
import java.io.Serializable;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/el/Converter.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/el/Converter.java
similarity index 93%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/el/Converter.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/el/Converter.java
index db3710a..94f7db9 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/el/Converter.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/el/Converter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.el;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.el;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
@@ -29,7 +29,7 @@ import javax.portlet.PortletPreferences;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.convert.DateParamConverter;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.convert.DateParamConverter;
/**
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/el/Expression.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/el/Expression.java
similarity index 94%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/el/Expression.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/el/Expression.java
index eb43cf8..176b9ac 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/el/Expression.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/el/Expression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.el;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.el;
/**
* @author Neil Griffin
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/el/Fields.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/el/Fields.java
similarity index 96%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/el/Fields.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/el/Fields.java
index 981e457..a53ccc6 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/el/Fields.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/el/Fields.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.el;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.el;
import java.util.Collection;
import java.util.LinkedHashSet;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/event/MvcEventListener.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/event/MvcEventListener.java
similarity index 97%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/event/MvcEventListener.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/event/MvcEventListener.java
index 9fde41c..3050418 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/event/MvcEventListener.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/event/MvcEventListener.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.event;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.event;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/portlet/ApplicantPortlet.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/portlet/ApplicantPortlet.java
similarity index 97%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/portlet/ApplicantPortlet.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/portlet/ApplicantPortlet.java
index 87dbeda..38c1cec 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/portlet/ApplicantPortlet.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/portlet/ApplicantPortlet.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.portlet;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.portlet;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/portlet/PortletContainer.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/portlet/PortletContainer.java
similarity index 96%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/portlet/PortletContainer.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/portlet/PortletContainer.java
index 3c56406..016e375 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/portlet/PortletContainer.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/portlet/PortletContainer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.portlet;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.portlet;
import javax.portlet.PortletRequest;
import javax.portlet.filter.PortletRequestWrapper;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/service/CityService.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/service/CityService.java
similarity index 86%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/service/CityService.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/service/CityService.java
index 7581ea0..71b29ae 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/service/CityService.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/service/CityService.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.service;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.service;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto.City;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.City;
/**
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/service/ProvinceService.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/service/ProvinceService.java
similarity index 86%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/service/ProvinceService.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/service/ProvinceService.java
index 3ade51b..7fbd8bb 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/service/ProvinceService.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/service/ProvinceService.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.service;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.service;
import java.util.List;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto.Province;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.Province;
/**
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/service/mock/CityServiceMockImpl.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/service/mock/CityServiceMockImpl.java
similarity index 88%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/service/mock/CityServiceMockImpl.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/service/mock/CityServiceMockImpl.java
index 7d923d9..87967c2 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/service/mock/CityServiceMockImpl.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/service/mock/CityServiceMockImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.service.mock;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.service.mock;
import java.util.ArrayList;
import java.util.Collections;
@@ -24,9 +24,9 @@ import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto.City;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.service.CityService;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.service.ProvinceService;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.City;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.service.CityService;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.service.ProvinceService;
/**
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/service/mock/ProvinceServiceMockImpl.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/service/mock/ProvinceServiceMockImpl.java
similarity index 90%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/service/mock/ProvinceServiceMockImpl.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/service/mock/ProvinceServiceMockImpl.java
index f279bba..5517963 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/service/mock/ProvinceServiceMockImpl.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/service/mock/ProvinceServiceMockImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.service.mock;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.service.mock;
import java.util.ArrayList;
import java.util.Collections;
@@ -23,8 +23,8 @@ import java.util.List;
import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.dto.Province;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.service.ProvinceService;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.Province;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.service.ProvinceService;
/**
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/servlet/AttachmentSessionListener.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/servlet/AttachmentSessionListener.java
similarity index 96%
rename from demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/servlet/AttachmentSessionListener.java
rename to demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/servlet/AttachmentSessionListener.java
index 9dca9d9..a695a56 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/jsp/servlet/AttachmentSessionListener.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/servlet/AttachmentSessionListener.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.jsp.servlet;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.servlet;
import java.io.File;
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/resources/log4j.properties b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/resources/log4j.properties
index 4d9a0df..36456b0 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/resources/log4j.properties
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/resources/log4j.properties
@@ -22,4 +22,4 @@ log4j.rootLogger=INFO, R
log4j.appender.R=org.apache.log4j.ConsoleAppender
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
-log4j.logger.com.liferay.blade.samples.applicant.mvcbean.cdi.jsp=DEBUG
+log4j.logger.org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp=DEBUG
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantActionController.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantActionController.java
similarity index 92%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantActionController.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantActionController.java
index e0a8650..d31585c 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantActionController.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantActionController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.controller;
import java.io.File;
import java.util.List;
@@ -37,8 +37,8 @@ import javax.ws.rs.BeanParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto.Applicant;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto.Attachment;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.Applicant;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.Attachment;
/**
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantRenderController.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantRenderController.java
similarity index 91%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantRenderController.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantRenderController.java
index 7172b19..1ce0196 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantRenderController.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantRenderController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.controller;
import java.util.List;
@@ -34,9 +34,9 @@ import javax.portlet.annotations.RenderMethod;
import javax.validation.executable.ExecutableType;
import javax.validation.executable.ValidateOnExecution;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto.Applicant;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto.Attachment;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.service.ProvinceService;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.Applicant;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.Attachment;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.service.ProvinceService;
/**
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantResourceController.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantResourceController.java
similarity index 94%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantResourceController.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantResourceController.java
index cbc0935..ebc9c2a 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantResourceController.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/ApplicantResourceController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.controller;
import java.io.File;
import java.io.IOException;
@@ -38,9 +38,9 @@ import javax.validation.executable.ValidateOnExecution;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto.Attachment;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto.City;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.service.CityService;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.Attachment;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.City;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.service.CityService;
/**
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/AttachmentManager.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/AttachmentManager.java
similarity index 91%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/AttachmentManager.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/AttachmentManager.java
index cdedbc4..59ab5f1 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/AttachmentManager.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/AttachmentManager.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.controller;
import java.io.File;
import java.util.ArrayList;
@@ -24,7 +24,7 @@ import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.servlet.ServletContext;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto.Attachment;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.Attachment;
/**
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/ControllerUtil.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/ControllerUtil.java
similarity index 93%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/ControllerUtil.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/ControllerUtil.java
index bd399c1..98d9aae 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/ControllerUtil.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/ControllerUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.controller;
import javax.portlet.MimeResponse;
import javax.portlet.ResourceURL;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/HelpRenderController.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/HelpRenderController.java
similarity index 93%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/HelpRenderController.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/HelpRenderController.java
index b96318e..e087f25 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/HelpRenderController.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/HelpRenderController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.controller;
import javax.enterprise.context.ApplicationScoped;
import javax.mvc.Controller;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesActionController.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesActionController.java
similarity index 96%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesActionController.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesActionController.java
index 4043eef..e5d0a4c 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesActionController.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesActionController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.controller;
import java.util.Enumeration;
import java.util.ResourceBundle;
@@ -43,7 +43,7 @@ import javax.ws.rs.FormParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto.Preferences;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.Preferences;
/**
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesRenderController.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesRenderController.java
similarity index 92%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesRenderController.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesRenderController.java
index d988948..6f8572a 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesRenderController.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesRenderController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.controller;
import java.util.Map;
@@ -30,7 +30,7 @@ import javax.portlet.annotations.RenderMethod;
import javax.validation.executable.ExecutableType;
import javax.validation.executable.ValidateOnExecution;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto.Preferences;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.Preferences;
/**
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/TermsResourceController.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/TermsResourceController.java
similarity index 97%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/TermsResourceController.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/TermsResourceController.java
index e508dd9..c6070ba 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/controller/TermsResourceController.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/TermsResourceController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.controller;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.controller;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/convert/DateParamConverter.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/convert/DateParamConverter.java
similarity index 95%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/convert/DateParamConverter.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/convert/DateParamConverter.java
index 9b861b5..e83dc86 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/convert/DateParamConverter.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/convert/DateParamConverter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.convert;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.convert;
import java.text.DateFormat;
import java.text.ParseException;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/convert/DateParamConverterProvider.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/convert/DateParamConverterProvider.java
similarity index 95%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/convert/DateParamConverterProvider.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/convert/DateParamConverterProvider.java
index 8943b2b..a52cf47 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/convert/DateParamConverterProvider.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/convert/DateParamConverterProvider.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.convert;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.convert;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/Applicant.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Applicant.java
similarity index 98%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/Applicant.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Applicant.java
index c47eb7c..0924cbc 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/Applicant.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Applicant.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto;
import java.io.Serializable;
import java.util.Calendar;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/Attachment.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Attachment.java
similarity index 94%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/Attachment.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Attachment.java
index ae10bf9..d643799 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/Attachment.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Attachment.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto;
import java.io.File;
import java.io.Serializable;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/City.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/City.java
similarity index 95%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/City.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/City.java
index 79afe5f..044ea3a 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/City.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/City.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto;
import java.io.Serializable;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/Preferences.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Preferences.java
similarity index 94%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/Preferences.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Preferences.java
index 987494b..3127084 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/Preferences.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Preferences.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto;
import javax.validation.constraints.NotBlank;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/Province.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Province.java
similarity index 95%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/Province.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Province.java
index 03c808a..5d0bab3 100755
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/dto/Province.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Province.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto;
import java.io.Serializable;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/el/Converter.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/el/Converter.java
similarity index 92%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/el/Converter.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/el/Converter.java
index 17abd26..509d2d8 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/el/Converter.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/el/Converter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.el;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.el;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
@@ -29,7 +29,7 @@ import javax.portlet.PortletPreferences;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.convert.DateParamConverter;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.convert.DateParamConverter;
/**
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/el/Expression.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/el/Expression.java
similarity index 94%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/el/Expression.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/el/Expression.java
index 57c3bea..47334fd 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/el/Expression.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/el/Expression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.el;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.el;
/**
* @author Neil Griffin
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/el/Fields.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/el/Fields.java
similarity index 96%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/el/Fields.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/el/Fields.java
index c004c72..01c517a 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/el/Fields.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/el/Fields.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.el;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.el;
import java.util.Collection;
import java.util.LinkedHashSet;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/event/MvcEventListener.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/event/MvcEventListener.java
similarity index 97%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/event/MvcEventListener.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/event/MvcEventListener.java
index 02f7973..5064a1e 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/event/MvcEventListener.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/event/MvcEventListener.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.event;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.event;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/portlet/ApplicantPortlet.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/portlet/ApplicantPortlet.java
similarity index 97%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/portlet/ApplicantPortlet.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/portlet/ApplicantPortlet.java
index 654e178..f9b109f 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/portlet/ApplicantPortlet.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/portlet/ApplicantPortlet.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.portlet;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.portlet;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/portlet/PortletContainer.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/portlet/PortletContainer.java
similarity index 95%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/portlet/PortletContainer.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/portlet/PortletContainer.java
index c9ceebf..d6eeaea 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/portlet/PortletContainer.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/portlet/PortletContainer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.portlet;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.portlet;
import javax.portlet.PortletRequest;
import javax.portlet.filter.PortletRequestWrapper;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/service/CityService.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/service/CityService.java
similarity index 85%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/service/CityService.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/service/CityService.java
index 859679e..2d6bb1a 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/service/CityService.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/service/CityService.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.service;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.service;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto.City;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.City;
/**
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/service/ProvinceService.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/service/ProvinceService.java
similarity index 85%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/service/ProvinceService.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/service/ProvinceService.java
index 91b65ba..00b6414 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/service/ProvinceService.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/service/ProvinceService.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.service;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.service;
import java.util.List;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto.Province;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.Province;
/**
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/service/mock/CityServiceMockImpl.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/service/mock/CityServiceMockImpl.java
similarity index 87%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/service/mock/CityServiceMockImpl.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/service/mock/CityServiceMockImpl.java
index bf1a774..805cb30 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/service/mock/CityServiceMockImpl.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/service/mock/CityServiceMockImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.service.mock;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.service.mock;
import java.util.ArrayList;
import java.util.Collections;
@@ -24,9 +24,9 @@ import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto.City;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.service.CityService;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.service.ProvinceService;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.City;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.service.CityService;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.service.ProvinceService;
/**
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/service/mock/ProvinceServiceMockImpl.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/service/mock/ProvinceServiceMockImpl.java
similarity index 90%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/service/mock/ProvinceServiceMockImpl.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/service/mock/ProvinceServiceMockImpl.java
index 9a42038..38a5b70 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/service/mock/ProvinceServiceMockImpl.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/service/mock/ProvinceServiceMockImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.service.mock;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.service.mock;
import java.util.ArrayList;
import java.util.Collections;
@@ -23,8 +23,8 @@ import java.util.List;
import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.dto.Province;
-import com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.service.ProvinceService;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.Province;
+import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.service.ProvinceService;
/**
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/servlet/AttachmentSessionListener.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/servlet/AttachmentSessionListener.java
similarity index 96%
rename from demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/servlet/AttachmentSessionListener.java
rename to demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/servlet/AttachmentSessionListener.java
index fae0ea8..7cb2273 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/com/liferay/blade/samples/applicant/mvcbean/cdi/thymeleaf/servlet/AttachmentSessionListener.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/servlet/AttachmentSessionListener.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf.servlet;
+package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.servlet;
import java.io.File;
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/resources/log4j.properties b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/resources/log4j.properties
index b167cdf..c604072 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/resources/log4j.properties
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/resources/log4j.properties
@@ -22,4 +22,4 @@ log4j.rootLogger=INFO, R
log4j.appender.R=org.apache.log4j.ConsoleAppender
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
-log4j.logger.com.liferay.blade.samples.applicant.mvcbean.cdi.thymeleaf=DEBUG
+log4j.logger.org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf=DEBUG
diff --git a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/CSSIncludingHeaderMethod.java b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/CSSIncludingHeaderMethod.java
similarity index 98%
rename from demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/CSSIncludingHeaderMethod.java
rename to demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/CSSIncludingHeaderMethod.java
index 046120e..4cce5c0 100644
--- a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/CSSIncludingHeaderMethod.java
+++ b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/CSSIncludingHeaderMethod.java
@@ -17,7 +17,7 @@
*/
-package com.ibm.portal.samples;
+package org.apache.portals.pluto.demo.chat;
import java.io.IOException;
diff --git a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/ChatHistory.java b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/ChatHistory.java
similarity index 98%
rename from demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/ChatHistory.java
rename to demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/ChatHistory.java
index a314072..df82f6a 100644
--- a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/ChatHistory.java
+++ b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/ChatHistory.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package com.ibm.portal.samples;
+package org.apache.portals.pluto.demo.chat;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/ChatRoom.java b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/ChatRoom.java
similarity index 99%
rename from demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/ChatRoom.java
rename to demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/ChatRoom.java
index 4df0d1e..664b318 100644
--- a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/ChatRoom.java
+++ b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/ChatRoom.java
@@ -17,7 +17,7 @@
*/
-package com.ibm.portal.samples;
+package org.apache.portals.pluto.demo.chat;
import java.io.IOException;
diff --git a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/ChatRoomListener.java b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/ChatRoomListener.java
similarity index 97%
rename from demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/ChatRoomListener.java
rename to demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/ChatRoomListener.java
index 6dc158e..5b06c79 100644
--- a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/ChatRoomListener.java
+++ b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/ChatRoomListener.java
@@ -17,7 +17,7 @@
*/
-package com.ibm.portal.samples;
+package org.apache.portals.pluto.demo.chat;
import java.io.IOException;
diff --git a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/ChatRoomRunner.java b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/ChatRoomRunner.java
similarity index 98%
rename from demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/ChatRoomRunner.java
rename to demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/ChatRoomRunner.java
index 6df4522..cb0c1e9 100644
--- a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/ChatRoomRunner.java
+++ b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/ChatRoomRunner.java
@@ -17,7 +17,7 @@
*/
-package com.ibm.portal.samples;
+package org.apache.portals.pluto.demo.chat;
import java.io.PrintWriter;
diff --git a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/HelloWorldImage.java b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/HelloWorldImage.java
similarity index 98%
rename from demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/HelloWorldImage.java
rename to demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/HelloWorldImage.java
index f677af8..372fdbc 100644
--- a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/HelloWorldImage.java
+++ b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/HelloWorldImage.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package com.ibm.portal.samples;
+package org.apache.portals.pluto.demo.chat;
import javax.inject.Inject;
import javax.portlet.MimeResponse;
diff --git a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/HelloWorldRender.java b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/HelloWorldRender.java
similarity index 97%
rename from demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/HelloWorldRender.java
rename to demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/HelloWorldRender.java
index 24a2c2f..50ac6be 100644
--- a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/HelloWorldRender.java
+++ b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/HelloWorldRender.java
@@ -17,7 +17,7 @@
*/
-package com.ibm.portal.samples;
+package org.apache.portals.pluto.demo.chat;
import javax.inject.Inject;
import javax.portlet.annotations.RenderMethod;
diff --git a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/Help.java b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/Help.java
similarity index 96%
rename from demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/Help.java
rename to demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/Help.java
index 726ecd6..ab7e8a0 100644
--- a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/Help.java
+++ b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/Help.java
@@ -17,7 +17,7 @@
*/
-package com.ibm.portal.samples;
+package org.apache.portals.pluto.demo.chat;
import javax.portlet.annotations.RenderMethod;
diff --git a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/NameBean.java b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/NameBean.java
similarity index 99%
rename from demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/NameBean.java
rename to demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/NameBean.java
index 8de76a6..0efd8ad 100644
--- a/demo/chat-room-demo-portlet/src/main/java/com/ibm/portal/samples/NameBean.java
+++ b/demo/chat-room-demo-portlet/src/main/java/org/apache/portals/pluto/demo/chat/NameBean.java
@@ -17,7 +17,7 @@
*/
-package com.ibm.portal.samples;
+package org.apache.portals.pluto.demo.chat;
import javax.inject.Inject;
import javax.portlet.ActionParameters;
diff --git a/demo/chat-room-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml b/demo/chat-room-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml
index b97642d..8100748 100644
--- a/demo/chat-room-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/demo/chat-room-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml
@@ -9,7 +9,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:component-scan
- base-package="com.ibm.portal.samples"
+ base-package="org.apache.portals.pluto.demo.chat"
scope-resolver="com.liferay.bean.portlet.spring.extension.PortletScopeResolver">
<context:include-filter
type="custom"
diff --git a/demo/hub-demo-portlet/src/main/java/basic/portlet/ColorSelPortlet.java b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/ColorSelPortlet.java
similarity index 90%
rename from demo/hub-demo-portlet/src/main/java/basic/portlet/ColorSelPortlet.java
rename to demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/ColorSelPortlet.java
index 536f8a8..a541819 100644
--- a/demo/hub-demo-portlet/src/main/java/basic/portlet/ColorSelPortlet.java
+++ b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/ColorSelPortlet.java
@@ -16,18 +16,18 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.hub;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.DELIM;
-import static basic.portlet.Constants.PARAM_FG_BLUE;
-import static basic.portlet.Constants.PARAM_FG_COLOR;
-import static basic.portlet.Constants.PARAM_FG_GREEN;
-import static basic.portlet.Constants.PARAM_FG_RED;
-import static basic.portlet.Constants.PARAM_MSG_INPUT;
-import static basic.portlet.Constants.PARAM_SUBTYPE;
+import static org.apache.portals.pluto.demo.hub.Constants.DELIM;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_FG_BLUE;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_FG_COLOR;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_FG_GREEN;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_FG_RED;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_MSG_INPUT;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_SUBTYPE;
import java.io.IOException;
import java.util.Arrays;
diff --git a/demo/hub-demo-portlet/src/main/java/basic/portlet/Constants.java b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/Constants.java
similarity index 98%
rename from demo/hub-demo-portlet/src/main/java/basic/portlet/Constants.java
rename to demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/Constants.java
index 54ad2f8..092e07d 100644
--- a/demo/hub-demo-portlet/src/main/java/basic/portlet/Constants.java
+++ b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/Constants.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.hub;
import java.util.Collections;
import java.util.HashMap;
diff --git a/demo/hub-demo-portlet/src/main/java/basic/portlet/ImageSelPortlet.java b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/ImageSelPortlet.java
similarity index 92%
rename from demo/hub-demo-portlet/src/main/java/basic/portlet/ImageSelPortlet.java
rename to demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/ImageSelPortlet.java
index c1c6100..fc3f2cb 100644
--- a/demo/hub-demo-portlet/src/main/java/basic/portlet/ImageSelPortlet.java
+++ b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/ImageSelPortlet.java
@@ -16,14 +16,14 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.hub;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.PARAM_IMGNAME;
-import static basic.portlet.Constants.PARAM_SELTYPE;
-import static basic.portlet.Constants.PARAM_SELTYPE_RADIO;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_IMGNAME;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_SELTYPE;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_SELTYPE_RADIO;
import java.io.IOException;
import java.io.PrintWriter;
@@ -41,7 +41,7 @@ import javax.portlet.ResourceResponse;
import javax.portlet.annotations.Dependency;
import javax.portlet.annotations.LocaleString;
import javax.portlet.annotations.PortletConfiguration;
-import static basic.portlet.Constants.IMG_MAP;
+import static org.apache.portals.pluto.demo.hub.Constants.IMG_MAP;
/**
diff --git a/demo/hub-demo-portlet/src/main/java/basic/portlet/MessageBoxPortlet.java b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/MessageBoxPortlet.java
similarity index 95%
rename from demo/hub-demo-portlet/src/main/java/basic/portlet/MessageBoxPortlet.java
rename to demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/MessageBoxPortlet.java
index 365be7a..762d318 100644
--- a/demo/hub-demo-portlet/src/main/java/basic/portlet/MessageBoxPortlet.java
+++ b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/MessageBoxPortlet.java
@@ -16,15 +16,15 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.hub;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.ATTRIB_MSGS;
-import static basic.portlet.Constants.DELIM;
-import static basic.portlet.Constants.PARAM_COLOR;
-import static basic.portlet.Constants.PARAM_NUM_MSGS;
+import static org.apache.portals.pluto.demo.hub.Constants.ATTRIB_MSGS;
+import static org.apache.portals.pluto.demo.hub.Constants.DELIM;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_COLOR;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_NUM_MSGS;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/demo/hub-demo-portlet/src/main/java/basic/portlet/ParamTestPortlet.java b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/ParamTestPortlet.java
similarity index 97%
rename from demo/hub-demo-portlet/src/main/java/basic/portlet/ParamTestPortlet.java
rename to demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/ParamTestPortlet.java
index 1f50bf5..1bd7230 100644
--- a/demo/hub-demo-portlet/src/main/java/basic/portlet/ParamTestPortlet.java
+++ b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/ParamTestPortlet.java
@@ -16,9 +16,9 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.hub;
-import static basic.portlet.Constants.*;
+import static org.apache.portals.pluto.demo.hub.Constants.*;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/demo/hub-demo-portlet/src/main/java/basic/portlet/PartialActionPortlet.java b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/PartialActionPortlet.java
similarity index 97%
rename from demo/hub-demo-portlet/src/main/java/basic/portlet/PartialActionPortlet.java
rename to demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/PartialActionPortlet.java
index 9c6bce8..2d48098 100644
--- a/demo/hub-demo-portlet/src/main/java/basic/portlet/PartialActionPortlet.java
+++ b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/PartialActionPortlet.java
@@ -16,12 +16,12 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.hub;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.*;
+import static org.apache.portals.pluto.demo.hub.Constants.*;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/demo/hub-demo-portlet/src/main/java/basic/portlet/ResourcePortlet.java b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/ResourcePortlet.java
similarity index 93%
rename from demo/hub-demo-portlet/src/main/java/basic/portlet/ResourcePortlet.java
rename to demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/ResourcePortlet.java
index e5d8ea3..1852d25 100644
--- a/demo/hub-demo-portlet/src/main/java/basic/portlet/ResourcePortlet.java
+++ b/demo/hub-demo-portlet/src/main/java/org/apache/portals/pluto/demo/hub/ResourcePortlet.java
@@ -16,15 +16,15 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.hub;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.PARAM_BORDER_COLOR;
-import static basic.portlet.Constants.PARAM_COLOR;
-import static basic.portlet.Constants.PARAM_IMGNAME;
-import static basic.portlet.Constants.DEFAULT_IMAGE;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_BORDER_COLOR;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_COLOR;
+import static org.apache.portals.pluto.demo.hub.Constants.PARAM_IMGNAME;
+import static org.apache.portals.pluto.demo.hub.Constants.DEFAULT_IMAGE;
import java.io.IOException;
import java.io.PrintWriter;
@@ -47,7 +47,7 @@ import javax.portlet.annotations.PortletConfiguration;
import javax.portlet.annotations.PortletQName;
import javax.portlet.annotations.PublicRenderParameterDefinition;
import javax.portlet.annotations.Supports;
-import static basic.portlet.Constants.IMG_MAP;
+import static org.apache.portals.pluto.demo.hub.Constants.IMG_MAP;
/**
diff --git a/demo/hub-demo-portlet/src/main/resources/log4j.properties b/demo/hub-demo-portlet/src/main/resources/log4j.properties
index 5c0bfca..9ef8c56 100644
--- a/demo/hub-demo-portlet/src/main/resources/log4j.properties
+++ b/demo/hub-demo-portlet/src/main/resources/log4j.properties
@@ -3,4 +3,4 @@ log4j.appender.R=org.apache.log4j.ConsoleAppender
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
-log4j.logger.basic.portlet=DEBUG
+log4j.logger.org.apache.portals.pluto.demo.hub=DEBUG
diff --git a/demo/hub-demo-portlet/src/main/resources/logging.properties b/demo/hub-demo-portlet/src/main/resources/logging.properties
index a770dca..7740edd 100644
--- a/demo/hub-demo-portlet/src/main/resources/logging.properties
+++ b/demo/hub-demo-portlet/src/main/resources/logging.properties
@@ -34,4 +34,4 @@ org.apache.juli.FileHandler.directory = ${catalina.base}/logs
org.apache.juli.FileHandler.prefix = PortletHubDemo.
org.apache.pluto.level=FINE
-basic.portlet.level=FINEST
+org.apache.portals.pluto.demo.hub.level=FINEST
diff --git a/demo/hub-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml b/demo/hub-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml
index 129df14..798bbf0 100644
--- a/demo/hub-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/demo/hub-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml
@@ -9,7 +9,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:component-scan
- base-package="basic.portlet"
+ base-package="org.apache.portals.pluto.demo.hub"
scope-resolver="com.liferay.bean.portlet.spring.extension.PortletScopeResolver">
<context:include-filter
type="custom"
diff --git a/demo/hub-demo-portlet/src/main/webapp/WEB-INF/jsp/view-csp.jsp b/demo/hub-demo-portlet/src/main/webapp/WEB-INF/jsp/view-csp.jsp
index 4fbaac0..2928841 100644
--- a/demo/hub-demo-portlet/src/main/webapp/WEB-INF/jsp/view-csp.jsp
+++ b/demo/hub-demo-portlet/src/main/webapp/WEB-INF/jsp/view-csp.jsp
@@ -19,7 +19,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="static basic.portlet.Constants.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.hub.Constants.*" %>
<portlet:defineObjects />
diff --git a/demo/hub-demo-portlet/src/main/webapp/WEB-INF/jsp/view-ptp.jsp b/demo/hub-demo-portlet/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
index 1cf1eb2..ba5ecea 100644
--- a/demo/hub-demo-portlet/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
+++ b/demo/hub-demo-portlet/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
@@ -19,7 +19,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="static basic.portlet.Constants.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.hub.Constants.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AppSessionRandomNumberBean.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AppSessionRandomNumberBean.java
similarity index 96%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AppSessionRandomNumberBean.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AppSessionRandomNumberBean.java
index 4359498..c97e0f5 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AppSessionRandomNumberBean.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AppSessionRandomNumberBean.java
@@ -17,7 +17,7 @@
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import java.io.Serializable;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/ApplicationRandomNumberBean.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/ApplicationRandomNumberBean.java
similarity index 96%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/ApplicationRandomNumberBean.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/ApplicationRandomNumberBean.java
index e50ee60..49978eb 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/ApplicationRandomNumberBean.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/ApplicationRandomNumberBean.java
@@ -17,7 +17,7 @@
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import javax.enterprise.context.ApplicationScoped;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncCompleteBean.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncCompleteBean.java
similarity index 96%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncCompleteBean.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncCompleteBean.java
index 32e50f7..6a3ee11 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncCompleteBean.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncCompleteBean.java
@@ -17,7 +17,7 @@
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import javax.portlet.annotations.PortletRequestScoped;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncConstants.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncConstants.java
similarity index 95%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncConstants.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncConstants.java
index 2683a5b..770fd46 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncConstants.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncConstants.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
/**
* Shared constants for Async demo.
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncDialogBean.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncDialogBean.java
similarity index 99%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncDialogBean.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncDialogBean.java
index 4fd64be..0dc8da6 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncDialogBean.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncDialogBean.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncFilter.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncFilter.java
similarity index 98%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncFilter.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncFilter.java
index d207233..74fac59 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncFilter.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncFilter.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncListener.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncListener.java
similarity index 96%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncListener.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncListener.java
index 41e1fa9..5341e0f 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncListener.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncListener.java
@@ -16,9 +16,9 @@
* under the License.
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
-import static org.apache.portals.samples.AsyncPortlet.ATTRIB_TIMEOUT;
+import static org.apache.portals.pluto.demo.v3annotated.AsyncPortlet.ATTRIB_TIMEOUT;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,7 +31,7 @@ import javax.portlet.PortletAsyncListener;
import javax.portlet.ResourceRequest;
import javax.portlet.ResourceResponse;
-import org.apache.portals.samples.AsyncDialogBean.TimeoutType;
+import org.apache.portals.pluto.demo.v3annotated.AsyncDialogBean.TimeoutType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncPortlet.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncPortlet.java
similarity index 98%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncPortlet.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncPortlet.java
index 2f825e2..a5e0f69 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncPortlet.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncPortlet.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import java.io.IOException;
import java.io.PrintWriter;
@@ -35,7 +35,7 @@ import javax.portlet.ResourceRequest;
import javax.portlet.ResourceResponse;
import javax.portlet.annotations.ServeResourceMethod;
-import org.apache.portals.samples.AsyncDialogBean.OutputType;
+import org.apache.portals.pluto.demo.v3annotated.AsyncDialogBean.OutputType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncRunnable.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncRunnable.java
similarity index 99%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncRunnable.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncRunnable.java
index afe76c1..5c060fb 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/AsyncRunnable.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/AsyncRunnable.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/CSSIncludingHeaderMethod.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/CSSIncludingHeaderMethod.java
similarity index 97%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/CSSIncludingHeaderMethod.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/CSSIncludingHeaderMethod.java
index 3a8c88b..651e78c 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/CSSIncludingHeaderMethod.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/CSSIncludingHeaderMethod.java
@@ -17,7 +17,7 @@
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import java.io.IOException;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/HelloWorldImage.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/HelloWorldImage.java
similarity index 98%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/HelloWorldImage.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/HelloWorldImage.java
index 6e2b868..ef6b52c 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/HelloWorldImage.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/HelloWorldImage.java
@@ -17,7 +17,7 @@
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import javax.inject.Inject;
import javax.portlet.PortletRequest;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/HelloWorldRender.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/HelloWorldRender.java
similarity index 98%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/HelloWorldRender.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/HelloWorldRender.java
index a34fc6e..4e70e3e 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/HelloWorldRender.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/HelloWorldRender.java
@@ -17,7 +17,7 @@
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import javax.inject.Inject;
import javax.portlet.RenderRequest;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/Log.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/Log.java
similarity index 96%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/Log.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/Log.java
index 53e7330..270e2c7 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/Log.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/Log.java
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/LoggingInterceptor.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/LoggingInterceptor.java
similarity index 97%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/LoggingInterceptor.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/LoggingInterceptor.java
index 388abf1..4306294 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/LoggingInterceptor.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/LoggingInterceptor.java
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/MultipartPortlet.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/MultipartPortlet.java
similarity index 99%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/MultipartPortlet.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/MultipartPortlet.java
index ab9c1e6..61ab557 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/MultipartPortlet.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/MultipartPortlet.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/NameBean.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/NameBean.java
similarity index 98%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/NameBean.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/NameBean.java
index d66d24d..36fb4a7 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/NameBean.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/NameBean.java
@@ -17,7 +17,7 @@
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import java.io.IOException;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PathDisplay.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PathDisplay.java
similarity index 99%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PathDisplay.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PathDisplay.java
index f548f06..404a33d 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PathDisplay.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PathDisplay.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import java.util.Arrays;
import java.util.HashMap;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PathDisplayServlet.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PathDisplayServlet.java
similarity index 98%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PathDisplayServlet.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PathDisplayServlet.java
index eb60213..750e86f 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PathDisplayServlet.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PathDisplayServlet.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PathInfoPortlet.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PathInfoPortlet.java
similarity index 99%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PathInfoPortlet.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PathInfoPortlet.java
index ed1d617..631018d 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PathInfoPortlet.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PathInfoPortlet.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PortletRequestRandomNumberBean.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PortletRequestRandomNumberBean.java
similarity index 96%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PortletRequestRandomNumberBean.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PortletRequestRandomNumberBean.java
index 6e4241c..361c145 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PortletRequestRandomNumberBean.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PortletRequestRandomNumberBean.java
@@ -17,7 +17,7 @@
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import javax.inject.Named;
import javax.portlet.annotations.PortletRequestScoped;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PortletSessionRandomNumberBean.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PortletSessionRandomNumberBean.java
similarity index 96%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PortletSessionRandomNumberBean.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PortletSessionRandomNumberBean.java
index 9a66824..ce21735 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/PortletSessionRandomNumberBean.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/PortletSessionRandomNumberBean.java
@@ -17,7 +17,7 @@
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import java.io.Serializable;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/RenderLink.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/RenderLink.java
similarity index 98%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/RenderLink.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/RenderLink.java
index 9020460..0aae875 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/RenderLink.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/RenderLink.java
@@ -32,7 +32,7 @@
* (TestCaseName)-detail - a detailed message about the test
*
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import java.io.IOException;
import java.io.Writer;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/RequestRandomNumberBean.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/RequestRandomNumberBean.java
similarity index 96%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/RequestRandomNumberBean.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/RequestRandomNumberBean.java
index 4102d5d..e3f40a3 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/RequestRandomNumberBean.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/RequestRandomNumberBean.java
@@ -17,7 +17,7 @@
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import javax.enterprise.context.RequestScoped;
diff --git a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/SessionRandomNumberBean.java b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/SessionRandomNumberBean.java
similarity index 96%
rename from demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/SessionRandomNumberBean.java
rename to demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/SessionRandomNumberBean.java
index 1d502b5..fa01127 100644
--- a/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/samples/SessionRandomNumberBean.java
+++ b/demo/v3-annotated-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3annotated/SessionRandomNumberBean.java
@@ -17,7 +17,7 @@
*/
-package org.apache.portals.samples;
+package org.apache.portals.pluto.demo.v3annotated;
import java.io.Serializable;
diff --git a/demo/v3-annotated-demo-portlet/src/main/resources/log4j.properties b/demo/v3-annotated-demo-portlet/src/main/resources/log4j.properties
index 4b93009..507c8a4 100644
--- a/demo/v3-annotated-demo-portlet/src/main/resources/log4j.properties
+++ b/demo/v3-annotated-demo-portlet/src/main/resources/log4j.properties
@@ -3,4 +3,4 @@ log4j.appender.R=org.apache.log4j.ConsoleAppender
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
-log4j.logger.org.apache.portals.samples=DEBUG
+log4j.logger.org.apache.portals.pluto.demo.v3annotated=DEBUG
diff --git a/demo/v3-annotated-demo-portlet/src/main/resources/logging.properties b/demo/v3-annotated-demo-portlet/src/main/resources/logging.properties
index 91ee0c9..45e680b 100644
--- a/demo/v3-annotated-demo-portlet/src/main/resources/logging.properties
+++ b/demo/v3-annotated-demo-portlet/src/main/resources/logging.properties
@@ -34,4 +34,4 @@ org.apache.juli.FileHandler.directory = ${catalina.base}/logs
org.apache.juli.FileHandler.prefix = PortletV3AnnotatedDemo.
org.apache.pluto.level=FINE
-org.apache.portals.samples.level=FINER
+org.apache.portals.pluto.demo.v3annotated.level=FINER
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml b/demo/v3-annotated-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml
index 191aa61..af34afa 100644
--- a/demo/v3-annotated-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml
@@ -9,7 +9,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:component-scan
- base-package="org.apache.portals.samples"
+ base-package="org.apache.portals.pluto.demo.v3annotated"
scope-resolver="com.liferay.bean.portlet.spring.extension.PortletScopeResolver">
<context:include-filter
type="custom"
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/WEB-INF/jsp/asyncDialog.jsp b/demo/v3-annotated-demo-portlet/src/main/webapp/WEB-INF/jsp/asyncDialog.jsp
index 941087a..8194354 100644
--- a/demo/v3-annotated-demo-portlet/src/main/webapp/WEB-INF/jsp/asyncDialog.jsp
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/WEB-INF/jsp/asyncDialog.jsp
@@ -19,7 +19,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="static org.apache.portals.samples.AsyncDialogBean.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3annotated.AsyncDialogBean.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-annotated-demo-portlet/src/main/webapp/WEB-INF/jsp/pathinfo.jsp b/demo/v3-annotated-demo-portlet/src/main/webapp/WEB-INF/jsp/pathinfo.jsp
index 5b4af84..6766d5e 100644
--- a/demo/v3-annotated-demo-portlet/src/main/webapp/WEB-INF/jsp/pathinfo.jsp
+++ b/demo/v3-annotated-demo-portlet/src/main/webapp/WEB-INF/jsp/pathinfo.jsp
@@ -19,7 +19,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="org.apache.portals.samples.*" %>
+<%@ page import="org.apache.portals.pluto.demo.v3annotated.*" %>
<%@ page import="java.util.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/ActEvtProxyServlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ActEvtProxyServlet.java
similarity index 91%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/ActEvtProxyServlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ActEvtProxyServlet.java
index c9f7a99..99ca2d4 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/ActEvtProxyServlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ActEvtProxyServlet.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,9 +32,9 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import static basic.portlet.TagLibPortlet.ATTRIB_TXT;
-import static basic.portlet.TagLibPortlet.PROXY;
-import static basic.portlet.TagLibPortlet.TEST;
+import static org.apache.portals.pluto.demo.v3.TagLibPortlet.ATTRIB_TXT;
+import static org.apache.portals.pluto.demo.v3.TagLibPortlet.PROXY;
+import static org.apache.portals.pluto.demo.v3.TagLibPortlet.TEST;
/**
* Servlet used by the {@link TagLibPortlet}.
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/AuthSCPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/AuthSCPortlet.java
similarity index 97%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/AuthSCPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/AuthSCPortlet.java
index 36b20b4..6591165 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/AuthSCPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/AuthSCPortlet.java
@@ -16,12 +16,12 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.PARAM_STATUSCODE;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_STATUSCODE;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/ColorSelPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ColorSelPortlet.java
similarity index 96%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/ColorSelPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ColorSelPortlet.java
index a44d129..6dad054 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/ColorSelPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ColorSelPortlet.java
@@ -16,9 +16,9 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
-import static basic.portlet.Constants.*;
+import static org.apache.portals.pluto.demo.v3.Constants.*;
import java.io.IOException;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/Constants.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/Constants.java
similarity index 99%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/Constants.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/Constants.java
index 642de53..e00f5e3 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/Constants.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/Constants.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import java.util.Collections;
import java.util.HashMap;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/DependencyPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/DependencyPortlet.java
similarity index 99%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/DependencyPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/DependencyPortlet.java
index 33d08f3..1093880 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/DependencyPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/DependencyPortlet.java
@@ -17,7 +17,7 @@
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/HeaderPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/HeaderPortlet.java
similarity index 97%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/HeaderPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/HeaderPortlet.java
index 2a7217a..a874875 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/HeaderPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/HeaderPortlet.java
@@ -16,9 +16,9 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
-import static basic.portlet.Constants.ATTRIB_PROPS;
+import static org.apache.portals.pluto.demo.v3.Constants.ATTRIB_PROPS;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/ImageSelPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ImageSelPortlet.java
similarity index 91%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/ImageSelPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ImageSelPortlet.java
index f23d80d..c4fc2c3 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/ImageSelPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ImageSelPortlet.java
@@ -16,14 +16,14 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.PARAM_IMGNAME;
-import static basic.portlet.Constants.PARAM_SELTYPE;
-import static basic.portlet.Constants.PARAM_SELTYPE_RADIO;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_IMGNAME;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_SELTYPE;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_SELTYPE_RADIO;
import java.io.IOException;
import java.io.PrintWriter;
@@ -38,7 +38,7 @@ import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.portlet.ResourceRequest;
import javax.portlet.ResourceResponse;
-import static basic.portlet.Constants.IMG_MAP;
+import static org.apache.portals.pluto.demo.v3.Constants.IMG_MAP;
/**
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/LongPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/LongPortlet.java
similarity index 98%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/LongPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/LongPortlet.java
index 1477409..5d50d05 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/LongPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/LongPortlet.java
@@ -16,12 +16,12 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.ATTRIB_LONGLINES;
+import static org.apache.portals.pluto.demo.v3.Constants.ATTRIB_LONGLINES;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/MessageBoxPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/MessageBoxPortlet.java
similarity index 98%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/MessageBoxPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/MessageBoxPortlet.java
index d176fc3..f5d1935 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/MessageBoxPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/MessageBoxPortlet.java
@@ -16,12 +16,12 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.*;
+import static org.apache.portals.pluto.demo.v3.Constants.*;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/ParamTestPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ParamTestPortlet.java
similarity index 98%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/ParamTestPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ParamTestPortlet.java
index 2f43815..e3fdaa5 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/ParamTestPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ParamTestPortlet.java
@@ -16,12 +16,12 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.*;
+import static org.apache.portals.pluto.demo.v3.Constants.*;
import java.io.IOException;
import java.util.Arrays;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/ParamUtil.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ParamUtil.java
similarity index 96%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/ParamUtil.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ParamUtil.java
index c8e7980..f9e550a 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/ParamUtil.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ParamUtil.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
/**
* Utility class for {@link ActEvtProxyServlet} and {@link TagLibPortlet}.
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/PortletConfigPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/PortletConfigPortlet.java
similarity index 95%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/PortletConfigPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/PortletConfigPortlet.java
index 3083faa..8195aee 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/PortletConfigPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/PortletConfigPortlet.java
@@ -16,15 +16,15 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.ATTRIB_PMS;
-import static basic.portlet.Constants.ATTRIB_PRPS;
-import static basic.portlet.Constants.ATTRIB_WS;
-import static basic.portlet.Constants.ATTRIB_CTX;
+import static org.apache.portals.pluto.demo.v3.Constants.ATTRIB_PMS;
+import static org.apache.portals.pluto.demo.v3.Constants.ATTRIB_PRPS;
+import static org.apache.portals.pluto.demo.v3.Constants.ATTRIB_WS;
+import static org.apache.portals.pluto.demo.v3.Constants.ATTRIB_CTX;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/RedirectPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/RedirectPortlet.java
similarity index 97%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/RedirectPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/RedirectPortlet.java
index f769485..8728c90 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/RedirectPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/RedirectPortlet.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +40,7 @@ import javax.portlet.annotations.LocaleString;
import javax.portlet.annotations.PortletConfiguration;
import static javax.portlet.MimeResponse.Copy.*;
-import static basic.portlet.Constants.*;
+import static org.apache.portals.pluto.demo.v3.Constants.*;
/**
* Portlet for testing the redirect funtionality, including the new getRedirectURL API.
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/ResourcePortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ResourcePortlet.java
similarity index 91%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/ResourcePortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ResourcePortlet.java
index e1d8303..ebdf3dc 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/ResourcePortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/ResourcePortlet.java
@@ -16,15 +16,15 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.PARAM_BORDER_COLOR;
-import static basic.portlet.Constants.PARAM_COLOR;
-import static basic.portlet.Constants.PARAM_IMGNAME;
-import static basic.portlet.Constants.DEFAULT_IMAGE;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_BORDER_COLOR;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_COLOR;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_IMGNAME;
+import static org.apache.portals.pluto.demo.v3.Constants.DEFAULT_IMAGE;
import java.io.IOException;
import java.io.PrintWriter;
@@ -39,7 +39,7 @@ import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.portlet.ResourceRequest;
import javax.portlet.ResourceResponse;
-import static basic.portlet.Constants.IMG_MAP;
+import static org.apache.portals.pluto.demo.v3.Constants.IMG_MAP;
/**
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/TagLibPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/TagLibPortlet.java
similarity index 99%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/TagLibPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/TagLibPortlet.java
index d2a09bf..3e4b881 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/TagLibPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/TagLibPortlet.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/TagLibTagsPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/TagLibTagsPortlet.java
similarity index 97%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/TagLibTagsPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/TagLibTagsPortlet.java
index 12428e8..89508a5 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/TagLibTagsPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/TagLibTagsPortlet.java
@@ -17,7 +17,7 @@
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import javax.portlet.ActionParameters;
import javax.portlet.ActionRequest;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/URLFilter.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/URLFilter.java
similarity index 98%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/URLFilter.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/URLFilter.java
index 039cca6..e5f874a 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/URLFilter.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/URLFilter.java
@@ -17,7 +17,7 @@
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/UrlAPTestPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/UrlAPTestPortlet.java
similarity index 99%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/UrlAPTestPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/UrlAPTestPortlet.java
index 2d723b8..9ce2d6f 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/UrlAPTestPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/UrlAPTestPortlet.java
@@ -16,12 +16,12 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.*;
+import static org.apache.portals.pluto.demo.v3.Constants.*;
import java.io.IOException;
import java.util.Arrays;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/UrlRPTestPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/UrlRPTestPortlet.java
similarity index 93%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/UrlRPTestPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/UrlRPTestPortlet.java
index b5d998c..5b648fa 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/UrlRPTestPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/UrlRPTestPortlet.java
@@ -16,22 +16,22 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.ATTRIB_PARAMS;
-import static basic.portlet.Constants.ATTRIB_RENURLS;
-import static basic.portlet.Constants.PARAM_AURLCOPY;
-import static basic.portlet.Constants.PARAM_AURLCOPY_ALL;
-import static basic.portlet.Constants.PARAM_NAME;
-import static basic.portlet.Constants.PARAM_REMTYPE;
-import static basic.portlet.Constants.PARAM_REMTYPE_REM;
-import static basic.portlet.Constants.PARAM_REMTYPE_SET;
-import static basic.portlet.Constants.PARAM_SETTYPE;
-import static basic.portlet.Constants.PARAM_SETTYPE_VARRAY;
-import static basic.portlet.Constants.PARAM_VALUES;
+import static org.apache.portals.pluto.demo.v3.Constants.ATTRIB_PARAMS;
+import static org.apache.portals.pluto.demo.v3.Constants.ATTRIB_RENURLS;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_AURLCOPY;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_AURLCOPY_ALL;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_NAME;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_REMTYPE;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_REMTYPE_REM;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_REMTYPE_SET;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_SETTYPE;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_SETTYPE_VARRAY;
+import static org.apache.portals.pluto.demo.v3.Constants.PARAM_VALUES;
import static javax.portlet.MimeResponse.Copy.ALL;
import static javax.portlet.MimeResponse.Copy.NONE;
diff --git a/demo/v3-demo-portlet/src/main/java/basic/portlet/UrlTestPortlet.java b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/UrlTestPortlet.java
similarity index 99%
rename from demo/v3-demo-portlet/src/main/java/basic/portlet/UrlTestPortlet.java
rename to demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/UrlTestPortlet.java
index a10660d..40bdd86 100644
--- a/demo/v3-demo-portlet/src/main/java/basic/portlet/UrlTestPortlet.java
+++ b/demo/v3-demo-portlet/src/main/java/org/apache/portals/pluto/demo/v3/UrlTestPortlet.java
@@ -16,12 +16,12 @@
* under the License.
*/
-package basic.portlet;
+package org.apache.portals.pluto.demo.v3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static basic.portlet.Constants.*;
+import static org.apache.portals.pluto.demo.v3.Constants.*;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/demo/v3-demo-portlet/src/main/resources/log4j.properties b/demo/v3-demo-portlet/src/main/resources/log4j.properties
index 5c0bfca..689b167 100644
--- a/demo/v3-demo-portlet/src/main/resources/log4j.properties
+++ b/demo/v3-demo-portlet/src/main/resources/log4j.properties
@@ -3,4 +3,4 @@ log4j.appender.R=org.apache.log4j.ConsoleAppender
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
-log4j.logger.basic.portlet=DEBUG
+log4j.logger.org.apache.portals.pluto.demo.v3=DEBUG
diff --git a/demo/v3-demo-portlet/src/main/resources/logging.properties b/demo/v3-demo-portlet/src/main/resources/logging.properties
index 244ecc2..5dd2095 100644
--- a/demo/v3-demo-portlet/src/main/resources/logging.properties
+++ b/demo/v3-demo-portlet/src/main/resources/logging.properties
@@ -35,4 +35,4 @@ org.apache.juli.FileHandler.prefix = PortletV3Demo.
org.apache.pluto.level=FINE
javax.portlet.level=FINEST
-basic.portlet.level=FINEST
+org.apache.portals.pluto.demo.v3.level=FINEST
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml
index 129df14..d888712 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/applicationContext.xml
@@ -9,7 +9,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:component-scan
- base-package="basic.portlet"
+ base-package="org.apache.portals.pluto.demo.v3"
scope-resolver="com.liferay.bean.portlet.spring.extension.PortletScopeResolver">
<context:include-filter
type="custom"
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/dependencyDialog.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/dependencyDialog.jsp
index 9ccdae4..15a6d34 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/dependencyDialog.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/dependencyDialog.jsp
@@ -19,7 +19,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="static basic.portlet.DependencyPortlet.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.DependencyPortlet.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibBeans.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibBeans.jsp
index 4f86da7..fc9e595 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibBeans.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibBeans.jsp
@@ -20,7 +20,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="static basic.portlet.TagLibPortlet.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.TagLibPortlet.*" %>
<%@ page import="static javax.portlet.PortletRequest.*" %>
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibDialog.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibDialog.jsp
index a84b4ca..0583a1c 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibDialog.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibDialog.jsp
@@ -19,8 +19,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="static basic.portlet.TagLibPortlet.*" %>
-<%@ page import="static basic.portlet.ParamUtil.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.TagLibPortlet.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.ParamUtil.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibObjects.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibObjects.jsp
index 7342dfe..a470bd9 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibObjects.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibObjects.jsp
@@ -20,7 +20,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="static basic.portlet.TagLibPortlet.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.TagLibPortlet.*" %>
<%@ page import="static javax.portlet.PortletRequest.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibTags.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibTags.jsp
index 1b16b61..bccfe9c 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibTags.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibTags.jsp
@@ -20,7 +20,7 @@ limitations under the License.
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="java.util.*" %>
-<%@ page import="static basic.portlet.TagLibPortlet.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.TagLibPortlet.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibTagsResource.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibTagsResource.jsp
index ed50fcf..1c4b764 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibTagsResource.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/tagLibTagsResource.jsp
@@ -20,7 +20,7 @@ limitations under the License.
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="java.util.*" %>
-<%@ page import="static basic.portlet.TagLibPortlet.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.TagLibPortlet.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-ascp.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-ascp.jsp
index 81e4c27..ed579d2 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-ascp.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-ascp.jsp
@@ -22,7 +22,7 @@ limitations under the License.
<%@ page import="java.io.*,java.util.*,javax.portlet.*" %>
<%@ page import="javax.portlet.MimeResponse.Copy" %>
<%@ page import="static javax.portlet.MimeResponse.Copy.*" %>
-<%@ page import="static basic.portlet.Constants.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.Constants.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-csp.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-csp.jsp
index 716bdfd..dc06d20 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-csp.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-csp.jsp
@@ -19,7 +19,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="static basic.portlet.Constants.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.Constants.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-hdp.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-hdp.jsp
index f6d93f4..069e0e6 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-hdp.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-hdp.jsp
@@ -19,7 +19,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="static basic.portlet.Constants.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.Constants.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-long.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-long.jsp
index 5c67c4b..f877b37 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-long.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-long.jsp
@@ -22,7 +22,7 @@ limitations under the License.
<%@ page import="java.io.*,java.util.*,javax.portlet.*" %>
<%@ page import="javax.portlet.MimeResponse.Copy" %>
<%@ page import="static javax.portlet.MimeResponse.Copy.*" %>
-<%@ page import="static basic.portlet.Constants.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.Constants.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-pcp.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-pcp.jsp
index f753905..e84eaed 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-pcp.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-pcp.jsp
@@ -16,7 +16,7 @@ implied.
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ page import="static basic.portlet.Constants.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.Constants.*" %>
<%@ page session="false" %>
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-ptp.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
index 01d1bd7..d04ef3b 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
@@ -20,7 +20,7 @@ limitations under the License.
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="java.io.*,java.util.*,javax.portlet.*" %>
-<%@ page import="static basic.portlet.Constants.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.Constants.*" %>
<%@ page import="static javax.portlet.MimeResponse.Copy.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-rdp.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-rdp.jsp
index 3645080..c97eb32 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-rdp.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-rdp.jsp
@@ -19,7 +19,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="static basic.portlet.Constants.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.Constants.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-uaptp.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-uaptp.jsp
index 91c3d2f..3bf0250 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-uaptp.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-uaptp.jsp
@@ -22,7 +22,7 @@ limitations under the License.
<%@ page import="java.io.*,java.util.*,javax.portlet.*" %>
<%@ page import="javax.portlet.MimeResponse.Copy" %>
<%@ page import="static javax.portlet.MimeResponse.Copy.*" %>
-<%@ page import="static basic.portlet.Constants.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.Constants.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-urptp.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-urptp.jsp
index 924d3cc..e4f6023 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-urptp.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-urptp.jsp
@@ -22,7 +22,7 @@ limitations under the License.
<%@ page import="java.io.*,java.util.*,javax.portlet.*" %>
<%@ page import="javax.portlet.MimeResponse.Copy" %>
<%@ page import="static javax.portlet.MimeResponse.Copy.*" %>
-<%@ page import="static basic.portlet.Constants.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.Constants.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-utp.jsp b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-utp.jsp
index 0c25e45..490c616 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-utp.jsp
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/jsp/view-utp.jsp
@@ -22,7 +22,7 @@ limitations under the License.
<%@ page import="java.io.*,java.util.*,javax.portlet.*" %>
<%@ page import="javax.portlet.MimeResponse.Copy" %>
<%@ page import="static javax.portlet.MimeResponse.Copy.*" %>
-<%@ page import="static basic.portlet.Constants.*" %>
+<%@ page import="static org.apache.portals.pluto.demo.v3.Constants.*" %>
<portlet:defineObjects />
diff --git a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/portlet.xml b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/portlet.xml
index 0d4926b..f7ed6cc 100644
--- a/demo/v3-demo-portlet/src/main/webapp/WEB-INF/portlet.xml
+++ b/demo/v3-demo-portlet/src/main/webapp/WEB-INF/portlet.xml
@@ -26,7 +26,7 @@ limitations under the License.
<portlet-name>V3ImageViewer</portlet-name>
<display-name>V3 Image Viewer Portlet</display-name>
- <portlet-class>basic.portlet.ResourcePortlet</portlet-class>
+ <portlet-class>org.apache.portals.pluto.demo.v3.ResourcePortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
@@ -53,7 +53,7 @@ limitations under the License.
<portlet-name>MessageBoxPortlet</portlet-name>
<display-name>Message Box Portlet</display-name>
- <portlet-class>basic.portlet.MessageBoxPortlet</portlet-class>
+ <portlet-class>org.apache.portals.pluto.demo.v3.MessageBoxPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
@@ -77,7 +77,7 @@ limitations under the License.
<portlet-name>V3ImageSelector</portlet-name>
<display-name>Image Selection Portlet - alt PRP name</display-name>
- <portlet-class>basic.portlet.ImageSelPortlet</portlet-class>
+ <portlet-class>org.apache.portals.pluto.demo.v3.ImageSelPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
@@ -103,7 +103,7 @@ limitations under the License.
<portlet-name>V3ColorSelector</portlet-name>
<display-name>Color Selection Portlet - alt QName</display-name>
- <portlet-class>basic.portlet.ColorSelPortlet</portlet-class>
+ <portlet-class>org.apache.portals.pluto.demo.v3.ColorSelPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
@@ -133,7 +133,7 @@ limitations under the License.
<portlet-name>PortletConfigPortlet1</portlet-name>
<display-name>Portlet Config Portlet #1</display-name>
- <portlet-class>basic.portlet.PortletConfigPortlet</portlet-class>
+ <portlet-class>org.apache.portals.pluto.demo.v3.PortletConfigPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
@@ -167,7 +167,7 @@ limitations under the License.
<portlet-name>PortletConfigPortlet2</portlet-name>
<display-name>Portlet Config Portlet #2</display-name>
- <portlet-class>basic.portlet.PortletConfigPortlet</portlet-class>
+ <portlet-class>org.apache.portals.pluto.demo.v3.PortletConfigPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
@@ -189,7 +189,7 @@ limitations under the License.
<portlet-name>ParamTestPortlet</portlet-name>
<display-name>V3 Parameter Test Portlet</display-name>
- <portlet-class>basic.portlet.ParamTestPortlet</portlet-class>
+ <portlet-class>org.apache.portals.pluto.demo.v3.ParamTestPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
@@ -210,7 +210,7 @@ limitations under the License.
<portlet-name>UrlTestPortlet</portlet-name>
<display-name>V3 URL Test Portlet</display-name>
- <portlet-class>basic.portlet.UrlTestPortlet</portlet-class>
+ <portlet-class>org.apache.portals.pluto.demo.v3.UrlTestPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
@@ -231,7 +231,7 @@ limitations under the License.
<portlet-name>UrlRPTestPortlet</portlet-name>
<display-name>V3 URL Render Parameter Test Portlet</display-name>
- <portlet-class>basic.portlet.UrlRPTestPortlet</portlet-class>
+ <portlet-class>org.apache.portals.pluto.demo.v3.UrlRPTestPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
@@ -252,7 +252,7 @@ limitations under the License.
<portlet-name>UrlAPTestPortlet</portlet-name>
<display-name>V3 Action URL Parameter Test Portlet</display-name>
- <portlet-class>basic.portlet.UrlAPTestPortlet</portlet-class>
+ <portlet-class>org.apache.portals.pluto.demo.v3.UrlAPTestPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
@@ -273,7 +273,7 @@ limitations under the License.
<portlet-name>LongPortlet</portlet-name>
<display-name>V3 Fragment Identifier Test Portlet</display-name>
- <portlet-class>basic.portlet.LongPortlet</portlet-class>
+ <portlet-class>org.apache.portals.pluto.demo.v3.LongPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
@@ -297,7 +297,7 @@ limitations under the License.
<portlet-name>AuthSCPortlet</portlet-name>
<display-name>V3 Authentication and Status Code Test Portlet</display-name>
- <portlet-class>basic.portlet.AuthSCPortlet</portlet-class>
+ <portlet-class>org.apache.portals.pluto.demo.v3.AuthSCPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
@@ -364,7 +364,7 @@ limitations under the License.
<listener>
<description>Test Listener</description>
- <listener-class>basic.portlet.URLFilter</listener-class>
+ <listener-class>org.apache.portals.pluto.demo.v3.URLFilter</listener-class>
</listener>
</portlet-app>
\ No newline at end of file