Skip to content

Commit 3ee8766

Browse files
authored
Add company support (#9)
* * support for multiple company/group configuration, compiles, tested with custom fields, not yet finished * added more documentation to xsd #2 * added hook scaffold to test most of the configuration #3 * * fixed wrong dependency * * fixed distributionManagement * * fixed documentation * fixed setup / reset of permission checker in thread local when setup is run with logged in user * fixed log information for portlet / resource permission setup * release commit
1 parent edc85c1 commit 3ee8766

27 files changed

+702
-427
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ We didn't publish binary yet so you'll need to build the jar yourself. Here are
1414
<dependency>
1515
<groupId>com.mimacom.liferay</groupId>
1616
<artifactId>db-setup-core</artifactId>
17-
<version>1.0.0</version>
17+
<version>1.1.0</version>
1818
</dependency>
1919
```
2020

2121
## Integration
2222
Run <code>com.mimacom.liferay.portal.setup.LiferaySetup#setup(java.io.File)</code> with following xml configuration:
2323
```xml
2424
<?xml version="1.0" encoding="UTF-8" ?>
25-
<setup xmlns="http://www.mimacom.com/liferay/setup">
25+
<setup xmlns="https://raw.githubusercontent.com/mimacom/liferay-db-setup-core/1.x/db-setup-core/src/main/resources/setup_definition-1.1.xsd">
2626
<configuration>
2727
<runasuser>test@liferay.com</runasuser>
2828
</configuration>

db-setup-core/pom.xml

Lines changed: 86 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6+
<parent>
7+
<groupId>com.mimacom.liferay</groupId>
8+
<artifactId>build-parent</artifactId>
9+
<version>1.1.0</version>
10+
</parent>
611
<groupId>com.mimacom.liferay</groupId>
7-
<version>1.0.1</version>
12+
<version>1.1.0</version>
813
<artifactId>db-setup-core</artifactId>
914
<name>Liferay Portal DB Setup core</name>
1015
<description>Library that allows to declare a set of Liferay data to be created and create them using the API.
@@ -18,7 +23,6 @@
1823
<java.version>1.7</java.version>
1924
<license.plugin.version>1.13</license.plugin.version>
2025
<resource.plugin.version>3.0.2</resource.plugin.version>
21-
<liferay.ce.version>6.2.5</liferay.ce.version>
2226
<source.plugin.version>3.0.1</source.plugin.version>
2327
<javadoc.plugin.version>2.10.4</javadoc.plugin.version>
2428
</properties>
@@ -39,13 +43,12 @@
3943
<configuration>
4044
<outputDirectory>${project.build.directory}/generated-sources/sources</outputDirectory>
4145
<sources>
42-
<source>${basedir}/src/main/resources/setup_definition-1.0.xsd</source>
46+
<source>${basedir}/src/main/resources/setup_definition-1.1.xsd</source>
4347
</sources>
4448
<packageName>com.mimacom.liferay.portal.setup.domain</packageName>
4549
<clearOutputDir>false</clearOutputDir>
4650
</configuration>
4751
</plugin>
48-
4952
<plugin>
5053
<artifactId>maven-compiler-plugin</artifactId>
5154
<version>2.5</version>
@@ -55,7 +58,6 @@
5558
<target>${java.version}</target>
5659
</configuration>
5760
</plugin>
58-
5961
<plugin>
6062
<groupId>org.codehaus.mojo</groupId>
6163
<artifactId>license-maven-plugin</artifactId>
@@ -82,7 +84,6 @@
8284
</execution>
8385
</executions>
8486
</plugin>
85-
8687
<plugin>
8788
<groupId>org.apache.maven.plugins</groupId>
8889
<artifactId>maven-resources-plugin</artifactId>
@@ -156,11 +157,13 @@
156157
<scope>test</scope>
157158
</dependency>
158159
</dependencies>
160+
159161
<scm>
160162
<connection>scm:git:git://github.com/mimacom/liferay-db-setup-core.git</connection>
161163
<developerConnection>scm:git:ssh://github.com:mimacom/liferay-db-setup-core.git</developerConnection>
162164
<url>https://github.com/mimacom/liferay-db-setup-core/tree/1.x</url>
163165
</scm>
166+
164167
<organization>
165168
<name>mimacom ag</name>
166169
<url>http://www.mimacom.com</url>
@@ -174,12 +177,88 @@
174177
<comments>A business-friendly OSS license</comments>
175178
</license>
176179
</licenses>
180+
177181
<developers>
182+
<developer>
183+
<name>Silvio Meier</name>
184+
<email>silvio.meier@empa.ch</email>
185+
<organization>Empa</organization>
186+
<organizationUrl>http://www.empa.ch</organizationUrl>
187+
</developer>
188+
<developer>
189+
<name>Ivan Greguric Ortolan</name>
190+
<email>ivan.g.ortolan@mimacom.com</email>
191+
<organization>mimacom ag</organization>
192+
<organizationUrl>http://www.mimacom.com</organizationUrl>
193+
</developer>
194+
<developer>
195+
<name>Gustav Novotny</name>
196+
<email>gustav.novotny@mimacom.com</email>
197+
<organization>mimacom ag</organization>
198+
<organizationUrl>http://www.mimacom.com</organizationUrl>
199+
</developer>
200+
<developer>
201+
<name>Ludovit Hajzer</name>
202+
<email>ludovit.hajzer@mimacom.com</email>
203+
<organization>mimacom ag</organization>
204+
<organizationUrl>http://www.mimacom.com</organizationUrl>
205+
</developer>
206+
<developer>
207+
<name>Marek Palenik</name>
208+
<email>marek.palenik@mimacom.com</email>
209+
<organization>mimacom ag</organization>
210+
<organizationUrl>http://www.mimacom.com</organizationUrl>
211+
</developer>
178212
<developer>
179213
<name>Pawel Kruszewski</name>
180214
<email>pawel.kruszewski@mimacom.com</email>
181-
<organization>mimacom</organization>
215+
<organization>mimacom ag</organization>
182216
<organizationUrl>http://www.mimacom.com</organizationUrl>
183217
</developer>
184218
</developers>
219+
220+
<profiles>
221+
<profile>
222+
<id>ossrh-distribution</id>
223+
<build>
224+
<plugins>
225+
<plugin>
226+
<groupId>org.sonatype.plugins</groupId>
227+
<artifactId>nexus-staging-maven-plugin</artifactId>
228+
<version>1.6.7</version>
229+
<extensions>true</extensions>
230+
<configuration>
231+
<serverId>ossrh</serverId>
232+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
233+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
234+
</configuration>
235+
</plugin>
236+
<plugin>
237+
<groupId>org.apache.maven.plugins</groupId>
238+
<artifactId>maven-gpg-plugin</artifactId>
239+
<version>1.5</version>
240+
<executions>
241+
<execution>
242+
<id>sign-artifacts</id>
243+
<phase>verify</phase>
244+
<goals>
245+
<goal>sign</goal>
246+
</goals>
247+
</execution>
248+
</executions>
249+
</plugin>
250+
</plugins>
251+
</build>
252+
<distributionManagement>
253+
<snapshotRepository>
254+
<id>ossrh</id>
255+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
256+
</snapshotRepository>
257+
<repository>
258+
<id>ossrh</id>
259+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
260+
</repository>
261+
</distributionManagement>
262+
</profile>
263+
</profiles>
185264
</project>

0 commit comments

Comments
 (0)