-
Notifications
You must be signed in to change notification settings - Fork 89
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #229 from mycontroller-org/development
Update MyController master to version 0.0.3.Alpha2
- Loading branch information
Showing
1,066 changed files
with
42,951 additions
and
19,183 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,4 +8,4 @@ branches: | |
| install: | ||
| - mvn -version -B | ||
| script: | ||
| - mvn test | ||
| - mvn verify | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| /target/ | ||
| /bin/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,13 @@ | ||
| #!/bin/bash | ||
| # | ||
| # Copyright (C) 2015-2016 Jeeva Kandasamy ([email protected]) | ||
| # Copyright 2015-2016 Jeeva Kandasamy ([email protected]) | ||
| # and other contributors as indicated by the @author tags. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| <!-- | ||
| Copyright 2015-2016 Jeeva Kandasamy ([email protected]) | ||
| and other contributors as indicated by the @author tags. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>org.mycontroller.standalone</groupId> | ||
| <artifactId>mycontroller-standalone-parent</artifactId> | ||
| <version>0.0.3.Alpha2</version> | ||
| </parent> | ||
|
|
||
| <artifactId>mycontroller-dist</artifactId> | ||
| <url>https://github.com/mycontroller-org</url> | ||
| <inceptionYear>2015</inceptionYear> | ||
| <packaging>jar</packaging> | ||
|
|
||
| <properties> | ||
| <mc.dist.finalName>${project.artifactId}-standalone-${project.version}</mc.dist.finalName> | ||
| <mc.dist.jar.finalName>${mc.dist.finalName}-single</mc.dist.jar.finalName> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <!-- internal dependencies --> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>mycontroller-core</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-shade-plugin</artifactId> | ||
| <configuration> | ||
| <createDependencyReducedPom>true</createDependencyReducedPom> | ||
| <filters> | ||
| <filter> | ||
| <artifact>*:*</artifact> | ||
| <excludes> | ||
| <exclude>META-INF/*.SF</exclude> | ||
| <exclude>META-INF/*.DSA</exclude> | ||
| <exclude>META-INF/*.RSA</exclude> | ||
| </excludes> | ||
| </filter> | ||
| </filters> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>shade</goal> | ||
| </goals> | ||
| <configuration> | ||
| <finalName>${mc.dist.jar.finalName}</finalName> | ||
| <transformers> | ||
| <transformer | ||
| implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> | ||
| <transformer | ||
| implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> | ||
| <mainClass>org.mycontroller.standalone.StartApp</mainClass> | ||
| </transformer> | ||
| </transformers> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>attached</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <finalName>${mc.dist.finalName}</finalName> | ||
| <descriptor>src/main/assembly/binary-deployment.xml</descriptor> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,23 @@ | ||
| <!-- | ||
| Copyright 2015-2016 Jeeva Kandasamy ([email protected]) | ||
| and other contributors as indicated by the @author tags. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
| <assembly> | ||
| <id>bundle</id> | ||
|
|
||
| <formats> | ||
| <format>zip</format> | ||
| <format>tar.gz</format> | ||
|
|
@@ -32,9 +49,9 @@ | |
| <directory>${project.basedir}/target</directory> | ||
| <outputDirectory>mycontroller/lib</outputDirectory> | ||
| <includes> | ||
| <include>mycontroller-standalone-*-single.jar</include> | ||
| <include>${mc.dist.jar.finalName}.jar</include> | ||
| </includes> | ||
| <fileMode>755</fileMode> | ||
| <fileMode>664</fileMode> | ||
| <directoryMode>764</directoryMode> | ||
| </fileSet> | ||
| <fileSet> | ||
|
|
@@ -54,4 +71,4 @@ | |
| <scope>runtime</scope> | ||
| </dependencySet> | ||
| </dependencySets> | ||
| </assembly> | ||
| </assembly> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| @REM | ||
| @REM Copyright (C) 2015-2016 Jeeva Kandasamy ([email protected]) | ||
| @REM Copyright 2015-2016 Jeeva Kandasamy ([email protected]) | ||
| @REM and other contributors as indicated by the @author tags. | ||
| @REM | ||
| @REM Licensed under the Apache License, Version 2.0 (the "License"); | ||
| @REM you may not use this file except in compliance with the License. | ||
| @REM You may obtain a copy of the License at | ||
| @REM | ||
| @REM http://www.apache.org/licenses/LICENSE-2.0 | ||
| @REM http://www.apache.org/licenses/LICENSE-2.0 | ||
| @REM | ||
| @REM Unless required by applicable law or agreed to in writing, software | ||
| @REM distributed under the License is distributed on an "AS IS" BASIS, | ||
|
|
@@ -16,12 +17,10 @@ | |
|
|
||
| @ECHO OFF | ||
| SET HEAP_MIN=-Xms8m | ||
| SET HEAP_MAX=-Xmx40m | ||
|
|
||
| SET MC_VERSION=0.0.3-alpha1 | ||
| SET HEAP_MAX=-Xmx100m | ||
|
|
||
| SET CONF_PROPERTIES_FILE=../conf/mycontroller.properties | ||
| SET CONF_LOG_FILE=../conf/logback.xml | ||
|
|
||
| @ECHO ON | ||
| java %HEAP_MIN% %HEAP_MAX% -Dlogback.configurationFile=%CONF_LOG_FILE% -Dmc.conf.file=%CONF_PROPERTIES_FILE% -jar ../lib/mycontroller-standalone-%MC_VERSION%-single.jar > ../logs/mycontroller_console.log 2>&1 | ||
| java %HEAP_MIN% %HEAP_MAX% -Dlogback.configurationFile=%CONF_LOG_FILE% -Dmc.conf.file=%CONF_PROPERTIES_FILE% -cp "../lib/*" org.mycontroller.standalone.StartApp > ../logs/mycontroller_console.log 2>&1 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,13 @@ | ||
| #!/bin/bash | ||
| # | ||
| # Copyright (C) 2015-2016 Jeeva Kandasamy ([email protected]) | ||
| # Copyright 2015-2016 Jeeva Kandasamy ([email protected]) | ||
| # and other contributors as indicated by the @author tags. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
|
|
@@ -25,19 +26,18 @@ cd ${ACTUAL_LOCATION} | |
|
|
||
| #Java Heap settings | ||
| HEAP_MIN=-Xms8m | ||
| HEAP_MAX=-Xmx40m | ||
| HEAP_MAX=-Xmx100m | ||
|
|
||
| JAVA_VERSION="1.7" | ||
| MC_VERSION="0.0.3-alpha1" | ||
|
|
||
| #configuration file location | ||
| CONF_PROPERTIES_FILE=../conf/mycontroller.properties | ||
| CONF_LOG_FILE=../conf/logback.xml | ||
|
|
||
| if type -p java; then | ||
| _java=java | ||
| elif [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then | ||
| if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then | ||
| _java="$JAVA_HOME/bin/java" | ||
| elif type -p java; then | ||
| _java=java | ||
| else | ||
| echo "java is not installed in our machine" | ||
| fi | ||
|
|
@@ -46,15 +46,15 @@ if [[ "$_java" ]]; then | |
| version=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}') | ||
| echo "java version: $version" | ||
| if [[ "$version" > "$JAVA_VERSION" ]]; then | ||
| MC_PID=`ps -ef | grep mycontroller-standalone | grep -v grep | awk '{ print $2 }'` | ||
| MC_PID=`ps -ef | grep "org.mycontroller.standalone.StartApp" | grep -v grep | awk '{ print $2 }'` | ||
| if [ ! -z "$MC_PID" ] | ||
| then | ||
| echo "Mycontroller.org server is already running on pid[${MC_PID}]" | ||
| else | ||
| java ${HEAP_MIN} ${HEAP_MAX} -Dlogback.configurationFile=${CONF_LOG_FILE} -Dmc.conf.file=${CONF_PROPERTIES_FILE} -jar ../lib/mycontroller-standalone-${MC_VERSION}-single.jar >> ../logs/mycontroller.log 2>&1 & | ||
| $_java ${HEAP_MIN} ${HEAP_MAX} -Dlogback.configurationFile=${CONF_LOG_FILE} -Dmc.conf.file=${CONF_PROPERTIES_FILE} -cp "../lib/*" org.mycontroller.standalone.StartApp >> ../logs/mycontroller.log 2>&1 & | ||
| echo 'Start issued for Mycontroller' | ||
| fi | ||
| else | ||
| else | ||
| echo "Mycontroller.org server required java version $JAVA_VERSION or later" | ||
| fi | ||
| fi | ||
|
|
||
Oops, something went wrong.