Skip to content

Commit

Permalink
Add company support (#9)
Browse files Browse the repository at this point in the history 
* * 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
  • Loading branch information
@ktor
ktor authored Jul 28, 2017
1 parent edc85c1 commit 3ee8766
Show file tree
Hide file tree
Showing 27 changed files with 702 additions and 427 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ We didn't publish binary yet so you'll need to build the jar yourself. Here are
<dependency>
<groupId>com.mimacom.liferay</groupId>
<artifactId>db-setup-core</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</dependency>
```

## Integration
Run <code>com.mimacom.liferay.portal.setup.LiferaySetup#setup(java.io.File)</code> with following xml configuration:
```xml
<?xml version="1.0" encoding="UTF-8" ?>
<setup xmlns="http://www.mimacom.com/liferay/setup">
<setup xmlns="https://raw.githubusercontent.com/mimacom/liferay-db-setup-core/1.x/db-setup-core/src/main/resources/setup_definition-1.1.xsd">
<configuration>
<runasuser>test@liferay.com</runasuser>
</configuration>
Expand Down
93 changes: 86 additions & 7 deletions db-setup-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.mimacom.liferay</groupId>
<artifactId>build-parent</artifactId>
<version>1.1.0</version>
</parent>
<groupId>com.mimacom.liferay</groupId>
<version>1.0.1</version>
<version>1.1.0</version>
<artifactId>db-setup-core</artifactId>
<name>Liferay Portal DB Setup core</name>
<description>Library that allows to declare a set of Liferay data to be created and create them using the API.
Expand All @@ -18,7 +23,6 @@
<java.version>1.7</java.version>
<license.plugin.version>1.13</license.plugin.version>
<resource.plugin.version>3.0.2</resource.plugin.version>
<liferay.ce.version>6.2.5</liferay.ce.version>
<source.plugin.version>3.0.1</source.plugin.version>
<javadoc.plugin.version>2.10.4</javadoc.plugin.version>
</properties>
Expand All @@ -39,13 +43,12 @@
<configuration>
<outputDirectory>${project.build.directory}/generated-sources/sources</outputDirectory>
<sources>
<source>${basedir}/src/main/resources/setup_definition-1.0.xsd</source>
<source>${basedir}/src/main/resources/setup_definition-1.1.xsd</source>
</sources>
<packageName>com.mimacom.liferay.portal.setup.domain</packageName>
<clearOutputDir>false</clearOutputDir>
</configuration>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5</version>
Expand All @@ -55,7 +58,6 @@
<target>${java.version}</target>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
Expand All @@ -82,7 +84,6 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
Expand Down Expand Up @@ -156,11 +157,13 @@
<scope>test</scope>
</dependency>
</dependencies>

<scm>
<connection>scm:git:git://github.com/mimacom/liferay-db-setup-core.git</connection>
<developerConnection>scm:git:ssh://github.com:mimacom/liferay-db-setup-core.git</developerConnection>
<url>https://github.com/mimacom/liferay-db-setup-core/tree/1.x</url>
</scm>

<organization>
<name>mimacom ag</name>
<url>http://www.mimacom.com</url>
Expand All @@ -174,12 +177,88 @@
<comments>A business-friendly OSS license</comments>
</license>
</licenses>

<developers>
<developer>
<name>Silvio Meier</name>
<email>silvio.meier@empa.ch</email>
<organization>Empa</organization>
<organizationUrl>http://www.empa.ch</organizationUrl>
</developer>
<developer>
<name>Ivan Greguric Ortolan</name>
<email>ivan.g.ortolan@mimacom.com</email>
<organization>mimacom ag</organization>
<organizationUrl>http://www.mimacom.com</organizationUrl>
</developer>
<developer>
<name>Gustav Novotny</name>
<email>gustav.novotny@mimacom.com</email>
<organization>mimacom ag</organization>
<organizationUrl>http://www.mimacom.com</organizationUrl>
</developer>
<developer>
<name>Ludovit Hajzer</name>
<email>ludovit.hajzer@mimacom.com</email>
<organization>mimacom ag</organization>
<organizationUrl>http://www.mimacom.com</organizationUrl>
</developer>
<developer>
<name>Marek Palenik</name>
<email>marek.palenik@mimacom.com</email>
<organization>mimacom ag</organization>
<organizationUrl>http://www.mimacom.com</organizationUrl>
</developer>
<developer>
<name>Pawel Kruszewski</name>
<email>pawel.kruszewski@mimacom.com</email>
<organization>mimacom</organization>
<organization>mimacom ag</organization>
<organizationUrl>http://www.mimacom.com</organizationUrl>
</developer>
</developers>

<profiles>
<profile>
<id>ossrh-distribution</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</profile>
</profiles>
</project>
Loading

0 comments on commit 3ee8766

Please sign in to comment.