RLiferayTool 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjgwZmZjZDVkZWU1MDY2NWRhOTdmNzVmYzUzNmIyMjlmZjQ5NmNkOQ==
+    NTRkYjBmN2YzNDRiNmIzOGVjNmM3MTNkMzE2NmViOGIzNjFhMmNlMA==
   data.tar.gz: !binary |-
-    ZTkxOTdlMzBlNDE1MzEwNjY0YTVmYzJiNTZhZTRjN2YwMDhlMDFiOQ==
+    NmFlMzQwNjgxMzBjZTZjNjljYjcyN2U1YjcwOWExODIzNTVjZTJhOQ==
 SHA512:
   metadata.gz: !binary |-
-    MjViZGJiM2JjYjgwYjYzN2FiYzNiMmU3ZDEyYjczYjUzMWQ3NzFlOTg4YmQw
-    NjJhODgyZDhhZjI3NzUxNmZkODk3ZjIxZmU2YzUzMGYwNzBmYjU1OWRkMDlh
-    Nzk4MDI4ZWIxMTExYzVkOGY5ZDFmODBiMDAwMjQyYmI3YjdkZjU=
+    NjFmYjkxMDY1ZjU1ZmNiMDY2Y2QwNWEzY2JjYzhhYTVlYTkzODFjNTI4MDQw
+    N2I5MGI1Mzg2NzM2OWU1M2JhZmU4NzFkZDRlYmZkYjgzYjg0NTEyNDVjN2Zm
+    N2ZlZTMyNTlmODZkZWJiNDAyMTJhNmI5ZTkzMWEwZjI1NGMzYmE=
   data.tar.gz: !binary |-
-    M2Q1ZDllNzgyNDUxODUyMTk1NzkyYjI1ZTk4NDM2YjY3YTgxNjY5NTBkMzM4
-    ODZmZWY5OGRkNmNkODlmZjA3OTA5NmVjM2IyYjlmN2JlNjYwNmZhZjczMThi
-    MzRiZjk5OWNjMzUwNDNmZjc4NGU5MzgyZjZiOWNmZDY4Y2RjMWY=
+    MDhmODVhN2RhMGRlZWRlYTc3YzhhMDY1NjViMWFjZTU1ZDhiYTFmMDVlNWVk
+    MjJjZWIzZDdiOGYwNjUxODA5ZWM3ZTI3NDZmZDkwMmY2YTE5YjM5N2U3NDA5
+    MDIyNjI1OTc3NmE5Nzk4MWE4NjM5MGJiNWNmYTc4MmU1NDk2OTU=

data/lib/r_liferay_lib/portlet_service_templates/ListItemLocalServiceImpl.java.erb

@@ -1,30 +1,30 @@
-package mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.service.impl;
+package <%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.service.impl;
 
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import java.util.Date;
-import mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.service.base.<%= template_variables['name']%>LocalServiceBaseImpl;
-import mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.model.<%= template_variables['name']%>;
+import <%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.service.base.<%= template_variables['name']%>LocalServiceBaseImpl;
+import <%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.model.<%= template_variables['name']%>;
 
 /**
  * The implementation of the <%= template_variables['name']%> local service.
  *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link mil.army.hrc.ikrome.<%= template_variables['project_name'] %>.service.<%= template_variables['name']%>LocalService} interface.
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link <%= template_variables['project_package'] %>.<%= template_variables['project_name'] %>.service.<%= template_variables['name']%>LocalService} interface.
  *
  * <p>
  * This is a local service. Methods of this service will not have security checks based on the propagated JAAS credentials because this service can only be accessed from within the same VM.
  * </p>
  *
  * @author Brian Wing Shun Chan
- * @see mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.service.base.<%= template_variables['name']%>LocalServiceBaseImpl
- * @see mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.service.<%= template_variables['name']%>LocalServiceUtil
+ * @see <%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.service.base.<%= template_variables['name']%>LocalServiceBaseImpl
+ * @see <%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.service.<%= template_variables['name']%>LocalServiceUtil
  */
 public class <%= template_variables['name']%>LocalServiceImpl extends <%= template_variables['name']%>LocalServiceBaseImpl {
     /*
      * NOTE FOR DEVELOPERS:
      *
-     * Never reference this interface directly. Always use {@link mil.army.hrc.ikrome.<%= template_variables['project_name'] %>.service.<%= template_variables['name']%>LocalServiceUtil} to access the <%= template_variables['name']%> local service.
+     * Never reference this interface directly. Always use {@link <%= template_variables['project_package'] %>.<%= template_variables['project_name'] %>.service.<%= template_variables['name']%>LocalServiceUtil} to access the <%= template_variables['name']%> local service.
      */
     public <%= template_variables['name']%> add<%= template_variables['name']%>(<% template_variables['columns'].each_with_index do |(column_name, column_object), index| %>
       <%= column_object.column_type %> <%=column_name%><% if index < template_variables['columns'].size - 1 %>,<%end%><% end %>

data/lib/r_liferay_lib/portlet_service_templates/ListItemServiceImpl.java.erb

@@ -1,30 +1,30 @@
-package mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.service.impl;
+package <%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.service.impl;
 
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import java.util.Date;
-import mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.service.base.<%= template_variables['name']%>ServiceBaseImpl;
-import mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.model.<%= template_variables['name']%>;
+import <%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.service.base.<%= template_variables['name']%>ServiceBaseImpl;
+import <%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.model.<%= template_variables['name']%>;
 
 /**
  * The implementation of the <%= template_variables['name']%> remote service.
  *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link mil.army.hrc.ikrome.<%= template_variables['project_name'] %>.service.<%= template_variables['name']%>Service} interface.
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link <%= template_variables['project_package'] %>.<%= template_variables['project_name'] %>.service.<%= template_variables['name']%>Service} interface.
  *
  * <p>
  * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS credentials because this service can be accessed remotely.
  * </p>
  *
  * @author Brian Wing Shun Chan
- * @see mil.army.hrc.ikrome.<%= template_variables['project_name'] %>.service.base.<%= template_variables['name']%>ServiceBaseImpl
- * @see mil.army.hrc.ikrome.<%= template_variables['project_name'] %>.service.<%= template_variables['name']%>ServiceUtil
+ * @see <%= template_variables['project_package'] %>.<%= template_variables['project_name'] %>.service.base.<%= template_variables['name']%>ServiceBaseImpl
+ * @see <%= template_variables['project_package'] %>.<%= template_variables['project_name'] %>.service.<%= template_variables['name']%>ServiceUtil
  */
 public class <%= template_variables['name']%>ServiceImpl extends <%= template_variables['name']%>ServiceBaseImpl {
     /*
      * NOTE FOR DEVELOPERS:
      *
-     * Never reference this interface directly. Always use {@link mil.army.hrc.ikrome.<%= template_variables['project_name'] %>.service.<%= template_variables['name']%>ServiceUtil} to access the <%= template_variables['name']%> remote service.
+     * Never reference this interface directly. Always use {@link <%= template_variables['project_package'] %>.<%= template_variables['project_name'] %>.service.<%= template_variables['name']%>ServiceUtil} to access the <%= template_variables['name']%> remote service.
      */
     
     public <%= template_variables['name']%> add<%= template_variables['name']%>(

data/lib/r_liferay_lib/portlet_service_templates/PortletController.java.erb

@@ -1,4 +1,4 @@
-package mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.portlet;
+package <%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.portlet;
 
 import com.liferay.portal.kernel.dao.orm.QueryUtil;
 import com.liferay.portal.kernel.dao.search.SearchContainer;
@@ -20,8 +20,8 @@ import javax.portlet.PortletException;
 import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.model.<%= template_variables['name']%>;
-import mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.service.<%= template_variables['name']%>LocalServiceUtil;
+import <%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.model.<%= template_variables['name']%>;
+import <%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.service.<%= template_variables['name']%>LocalServiceUtil;
 
 public class PortletController extends MVCPortlet {
 

data/lib/r_liferay_lib/portlet_service_templates/add.jsp.erb

@@ -4,9 +4,13 @@
 </portlet:actionURL>
 
 <aui:form action="${addItemURL}" method="post" name="newitemfm">
+  <jsp:useBean id="date" class="java.util.Date"/>
+  <fmt:formatDate value="${date}" pattern="MM" var="month"/>
+  <fmt:formatDate value="${date}" pattern="dd" var="day"/>
+  <fmt:formatDate value="${date}" pattern="yyyy" var="year" />
   <%- template_variables['columns'].each do |column_name, column_object| -%>
       <%- if column_object.getFormType == 'date' -%>
-    <liferay-ui:input-date  dayParam="<%=column_name%>Day" monthParam="<%=column_name%>Month" yearParam="<%=column_name%>Year" />
+    <liferay-ui:input-date  dayParam="<%=column_name%>Day" monthParam="<%=column_name%>Month" yearParam="<%=column_name%>Year" dayValue="${day}" monthValue="${month-1}" yearValue="${year}"/>
       <%- else -%>
     <aui:input type="<%= column_object.getFormType %>" name="<%= column_name %>" label="<%= column_name %>"></aui:input>
           <%- end -%>

data/lib/r_liferay_lib/portlet_service_templates/init.jsp.erb

@@ -7,6 +7,6 @@
 <%%@ taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %>
 <%%@ taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %>
 <%%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %>
-<%%@ page import="mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.service.<%= template_variables['name']%>LocalServiceUtil" %>
+<%%@ page import="<%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.service.<%= template_variables['name']%>LocalServiceUtil" %>
 
 <portlet:defineObjects />

data/lib/r_liferay_lib/portlet_service_templates/portlet.xml.erb

@@ -3,7 +3,7 @@
 	<portlet>
 		<portlet-name><%= template_variables['project_name'] %></portlet-name>
 		<display-name><%= template_variables['project_name'] %></display-name>
-		<portlet-class>mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.portlet.PortletController</portlet-class>
+		<portlet-class><%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.portlet.PortletController</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/view.jsp</value>

data/lib/r_liferay_lib/portlet_service_templates/view.jsp.erb

@@ -14,7 +14,7 @@
   />
 
   <liferay-ui:search-container-row
-  className="mil.army.hrc.ikrome.<%= template_variables['project_name'].downcase %>.model.<%= template_variables['name'] %>"
+  className="<%= template_variables['project_package'] %>.<%= template_variables['project_name'].downcase %>.model.<%= template_variables['name'] %>"
   keyProperty="<%= template_variables['primary_key'] %>"
   modelVar="item"
   >

data/lib/r_liferay_lib/prepare_portlet_service.rb

@@ -6,7 +6,7 @@ module RLiferayLib
 
     WEB_INF_DIR = '/src/main/webapp/WEB-INF'
     JSP_DIR = '/src/main/webapp/html'
-    JAVA_DIR = 'src/main/java/mil/army/hrc/ikrome'
+    JAVA_DIR = '/src/main/java/'
     PLUGIN_PACKAGE_NAME = 'liferay-plugin-package.properties'
     PORTLET_XML_NAME = 'portlet.xml'
     CONTROLLER_NAME = 'PortletController.java'
@@ -90,7 +90,7 @@ module RLiferayLib
 
 
     def generate_java_files
-      target_directory = self.target_directory + '/' + JAVA_DIR + "/#{self.template_variables['project_name'].downcase}"
+      target_directory = self.target_directory + '/' + JAVA_DIR  + self.template_variables['project_package'].gsub('.' ,'/' )+ "/#{self.template_variables['project_name'].downcase}"
       prepare_directory(target_directory)
       generate_controller(target_directory)
       generate_local_impl(target_directory)

data/lib/r_liferay_lib/read_pom.rb

@@ -3,7 +3,7 @@ require_relative 'xml_utility'
 
 module RLiferayLib
   class ReadPOM
-    attr_reader :pom_xml_file, :version
+    attr_reader :pom_xml_file, :version, :package
 
     def initialize(pom_xml_file)
       self.pom_xml_file=pom_xml_file
@@ -13,11 +13,12 @@ module RLiferayLib
 
 
     private
-    attr_writer :pom_xml_file, :version
+    attr_writer :pom_xml_file, :version, :package
 
     def read_xml
       xml_utility = XMLUtility.new(self.pom_xml_file)
-      self.version = xml_utility.xml_content.at_xpath('/project/version').to_s
+      self.version = xml_utility.xml_content.at_xpath('/project/version').text.to_s
+      self.package = xml_utility.xml_content.at_xpath('/project/groupId').text.to_s
     end
 
 

data/lib/r_liferay_tool.rb

@@ -53,6 +53,7 @@ class RLiferayTool < Thor
       template_variables = read_service.entities[read_service.entities.keys[0]]
       template_variables['project_name'] = project_name
       template_variables['project_version'] = read_pom.version
+      template_variables['project_package'] = read_pom.package
       prepare_portlet_service = RLiferayLib::PreparePortletService.new(template_directory, target_directory, template_variables)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: RLiferayTool
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Chris Lynch, Mike Zanchi