Merge pull request #34 from ktor/master

Minor fixes, 602 release prep.

Author: ktor

README.adoc

@@ -256,6 +256,11 @@ They are probably not perfect, please let me know if anything feels wrong or inc
 
 == Changelog
 
+=== Version 7.3.602
+==== Features & bug fixes
+* fixed configuration related resource reading, library can read e.g. article files from caller bundle
+* article-structure-key and article-template-key article element attributes are required
+
 === Version 7.3.601
 ==== Features & bug fixes
 * target Liferay Portal version is still minimum 7.3.6 (GA7)

pom.xml

@@ -448,7 +448,7 @@
             <email>ivan.g.ortolan@gmail.com</email>
             <url>https://github.com/ntrp</url>
             <organization>mimacom ag</organization>
-            <organizationUrl>http://www.mimacom.com</organizationUrl>
+            <organizationUrl>https://www.mimacom.com</organizationUrl>
         </developer>
         <developer>
             <id>piotrdiuk</id>
@@ -464,13 +464,19 @@
             <email>martin.ronky@gmail.com</email>
             <url>https://github.com/ronky</url>
             <organization>http://ronky.net</organization>
-            <organizationUrl>http://ronky.net</organizationUrl>
+            <organizationUrl>https://ronky.net</organizationUrl>
+        </developer>
+        <developer>
+            <name>Milan Kuljovsky</name>
+            <email>milan.kuljovsky@o2.sk</email>
+            <organization>O2</organization>
+            <organizationUrl>https://www.o2.sk</organizationUrl>
         </developer>
         <developer>
             <name>Silvio Meier</name>
             <email>silvio.meier@empa.ch</email>
             <organization>Empa</organization>
-            <organizationUrl>http://www.empa.ch</organizationUrl>
+            <organizationUrl>https://www.empa.ch</organizationUrl>
         </developer>
     </developers>
 

src/main/java/com/ableneo/liferay/portal/setup/core/SetupRoles.java

@@ -34,7 +34,7 @@ public static void setupRoles(final List<com.ableneo.liferay.portal.setup.domain
             try {
                 long companyId = SetupConfigurationThreadLocal.getRunInCompanyId();
                 RoleLocalServiceUtil.getRole(companyId, role.getName());
-                LOG.info(String.format("Setup: Role %1$s already exist, not creating...", role.getName()));
+                LOG.info(String.format("Setup: Role %s already exists in company %s, not creating...", role.getName(), companyId));
             } catch (NoSuchRoleException | ObjectNotFoundException e) {
                 addRole(role);
             } catch (SystemException | PortalException e) {
@@ -72,7 +72,7 @@ private static void addRole(final com.ableneo.liferay.portal.setup.domain.Role r
                 null
             );
 
-            LOG.info(String.format("Setup: Role %1$s does not exist, adding...", role.getName()));
+            LOG.info(String.format("Setup: Role %s does not exist in company %s, adding...", role.getName(), companyId));
         } catch (PortalException | SystemException e) {
             LOG.error("error while adding up roles", e);
         }

src/main/resources/setup_definition.xsd

@@ -651,8 +651,8 @@
                 <xs:element ref="role-permissions" minOccurs="0" maxOccurs="1"/>
                 <xs:element ref="category" minOccurs="0" maxOccurs="unbounded"/>
             </xs:sequence>
-            <xs:attribute name="article-structure-key" type="xs:string"/>
-            <xs:attribute name="article-template-key" type="xs:string"/>
+            <xs:attribute name="article-structure-key" type="xs:string" use="required"/>
+            <xs:attribute name="article-template-key" type="xs:string" use="required"/>
             <xs:attribute name="articleId" type="xs:string" default=""/>
             <xs:attribute name="title" use="required" type="xs:string"/>
             <xs:attribute name="article-folder-path" type="xs:string"/>