Skip to content

Develop #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

Develop #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d2c1f9f
Merge branch 'release/0.4.1'
Apr 13, 2015
43101ee
Merge pull request #1 from LewisWatson/master
LewisWatson Jun 12, 2015
cc979cf
Merge pull request #2 from LewisWatson/develop
LewisWatson Jun 12, 2015
63825ef
reduce memory need
mcparlandjcgi Jun 12, 2015
a5dcbf4
added scripts to build and install locally, I think they'd work but m…
mcparlandjcgi Jun 16, 2015
2ef4c31
dependencies generated
mcparlandjcgi Jun 16, 2015
ffd37c1
Added graphmls and other generated documentation, plus instructions o…
mcparlandjcgi Jun 17, 2015
6a73928
tidy up of markdown
mcparlandjcgi Jun 17, 2015
89c6773
finished the architecture diagram based on Maven dependencies
mcparlandjcgi Jun 17, 2015
98b2fd7
Merge pull request #3 from LewisWatson/building
johnmmcparland Jun 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ npm-debug.log
/web/src/main/webapp/libs
catalog-v001.xml
_site

8 changes: 4 additions & 4 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ Vagrant.configure(2) do |config|
config.vm.hostname = "lumify-dev"
config.vm.provider "virtualbox" do |vb|
vb.name = "lumify-dev"
vb.memory = 8192
vb.cpus = 4
vb.memory = 1024
vb.cpus = 1
end
config.vm.provision "shell", inline: "sed -i 's/lumify-dev *//g' /etc/hosts"
config.vm.provision "shell", inline: "echo \"192.168.33.10 lumify-dev\" >> /etc/hosts"
Expand All @@ -55,8 +55,8 @@ Vagrant.configure(2) do |config|
config.vm.hostname = "lumify-demo"
config.vm.provider "virtualbox" do |vb|
vb.name = "lumify-demo"
vb.memory = 8192
vb.cpus = 4
vb.memory = 1024
vb.cpus = 1
end
config.vm.network :forwarded_port, :guest => 8080, :host => 8080, :auto_correct => true
config.vm.network :forwarded_port, :guest => 8443, :host => 8443, :auto_correct => true
Expand Down
8,974 changes: 8,974 additions & 0 deletions benchmark/dependency.graphml
View file
Open in desktop

Large diffs are not rendered by default.

55 changes: 55 additions & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
export LUMIFY_HOME=${HOME}/git/lumify
export LOGDIR=/var/tmp/lumify/logs

if [[ ! -d ${LOGDIR} ]];then
mkdir -p ${LOGDIR}
fi

printHelp() {
echo "build.sh <option(s)>"
echo ""
echo "options include"
echo -e "\t-h\tprint this help info"
echo -e "\t-t\tskip tests"
echo -e "\t-i\tskip integration tests"
echo -e "\t-m\tincrease memory"
echo -e "\t-p\tincrease permgen"
echo -e "\t-d\tdebug"
echo ""
return 0
}

MAVEN_GOALS="clean package assembly:assembly install"

while getopts ":htimpd" opt; do
case $opt in
t)
MAVEN_ARGS="${MAVEN_ARGS} -DskipTests=true"
;;
i)
MAVEN_ARGS="${MAVEN_ARGS} -DskipITs"
;;
m)
MAVEN_OPTS="${MAVEN_OPTS} -Xms1024m -Xmx2048m"
;;
p)
MAVEN_OPTS="${MAVEN_OPTS} -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"
;;
d)
MAVEN_ARGS="${MAVEN_ARGS} -X"
;;
h)
printHelp
exit 0
;;
esac
done

#echo "MAVEN_OPTS = ${MAVEN_OPTS}"
#echo "MAVEN_ARGS = ${MAVEN_ARGS}"
#echo "MAVEN_GOALS = ${MAVEN_GOALS}"

#mvn ${MAVEN_ARGS} ${MAVEN_GOALS}

mvn -X -P "grunt unix",web-war,web-war-with-gpw,web-war-with-ui-plugins clean package -DskipTests

318 changes: 318 additions & 0 deletions core/core/dependency.graphml
View file
Open in desktop

Large diffs are not rendered by default.

84 changes: 84 additions & 0 deletions core/dependency.graphml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?> <graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd">
<key for="node" id="d0" yfiles.type="nodegraphics"/>
<key for="edge" id="d1" yfiles.type="edgegraphics"/>
<graph id="dependencies" edgedefault="directed">
<node id="821406550"><data key="d0"><y:ShapeNode><y:NodeLabel>io.lumify:lumify-core-group:pom:0.5.0-SNAPSHOT</y:NodeLabel></y:ShapeNode></data></node>
<node id="1355002934"><data key="d0"><y:ShapeNode><y:NodeLabel>org.slf4j:slf4j-api:jar:1.6.5:compile</y:NodeLabel></y:ShapeNode></data></node>
<edge source="821406550" target="1355002934"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>compile</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="1617718950"><data key="d0"><y:ShapeNode><y:NodeLabel>org.hamcrest:hamcrest-library:jar:1.3:test</y:NodeLabel></y:ShapeNode></data></node>
<node id="1859421630"><data key="d0"><y:ShapeNode><y:NodeLabel>org.hamcrest:hamcrest-core:jar:1.3:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="1617718950" target="1859421630"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<edge source="821406550" target="1617718950"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="1117304266"><data key="d0"><y:ShapeNode><y:NodeLabel>junit:junit:jar:4.11:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="821406550" target="1117304266"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="935789294"><data key="d0"><y:ShapeNode><y:NodeLabel>org.mockito:mockito-core:jar:1.9.5:test</y:NodeLabel></y:ShapeNode></data></node>
<node id="1787917277"><data key="d0"><y:ShapeNode><y:NodeLabel>org.objenesis:objenesis:jar:1.0:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="935789294" target="1787917277"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<edge source="821406550" target="935789294"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="1934485715"><data key="d0"><y:ShapeNode><y:NodeLabel>org.powermock:powermock-api-mockito:jar:1.5.1:test</y:NodeLabel></y:ShapeNode></data></node>
<node id="2146480072"><data key="d0"><y:ShapeNode><y:NodeLabel>org.mockito:mockito-all:jar:1.9.5:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="1934485715" target="2146480072"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="312784151"><data key="d0"><y:ShapeNode><y:NodeLabel>org.powermock:powermock-api-support:jar:1.5.1:test</y:NodeLabel></y:ShapeNode></data></node>
<node id="2070741648"><data key="d0"><y:ShapeNode><y:NodeLabel>org.powermock:powermock-core:jar:1.5.1:test</y:NodeLabel></y:ShapeNode></data></node>
<node id="834894654"><data key="d0"><y:ShapeNode><y:NodeLabel>org.javassist:javassist:jar:3.18.0-GA:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="2070741648" target="834894654"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<edge source="312784151" target="2070741648"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="416300280"><data key="d0"><y:ShapeNode><y:NodeLabel>org.powermock:powermock-reflect:jar:1.5.1:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="312784151" target="416300280"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<edge source="1934485715" target="312784151"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<edge source="821406550" target="1934485715"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="257084034"><data key="d0"><y:ShapeNode><y:NodeLabel>org.powermock:powermock-module-junit4:jar:1.5.1:test</y:NodeLabel></y:ShapeNode></data></node>
<node id="74261674"><data key="d0"><y:ShapeNode><y:NodeLabel>org.powermock:powermock-module-junit4-common:jar:1.5.1:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="257084034" target="74261674"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<edge source="821406550" target="257084034"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="427956011"><data key="d0"><y:ShapeNode><y:NodeLabel>net.sourceforge.cobertura:cobertura:jar:2.0.3:test</y:NodeLabel></y:ShapeNode></data></node>
<node id="733943074"><data key="d0"><y:ShapeNode><y:NodeLabel>org.ow2.asm:asm:jar:4.1:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="427956011" target="733943074"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="235176350"><data key="d0"><y:ShapeNode><y:NodeLabel>org.ow2.asm:asm-tree:jar:4.1:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="427956011" target="235176350"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="1239003970"><data key="d0"><y:ShapeNode><y:NodeLabel>org.ow2.asm:asm-commons:jar:4.1:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="427956011" target="1239003970"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="1938282478"><data key="d0"><y:ShapeNode><y:NodeLabel>org.ow2.asm:asm-util:jar:4.1:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="427956011" target="1938282478"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="1534166403"><data key="d0"><y:ShapeNode><y:NodeLabel>org.ow2.asm:asm-analysis:jar:4.1:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="427956011" target="1534166403"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="2046069339"><data key="d0"><y:ShapeNode><y:NodeLabel>oro:oro:jar:2.0.8:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="427956011" target="2046069339"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="631741162"><data key="d0"><y:ShapeNode><y:NodeLabel>jaxen:jaxen:jar:1.1-beta-8:test</y:NodeLabel></y:ShapeNode></data></node>
<node id="514558966"><data key="d0"><y:ShapeNode><y:NodeLabel>dom4j:dom4j:jar:1.6.1:test</y:NodeLabel></y:ShapeNode></data></node>
<node id="275895093"><data key="d0"><y:ShapeNode><y:NodeLabel>xml-apis:xml-apis:jar:1.0.b2:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="514558966" target="275895093"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<edge source="631741162" target="514558966"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="551634178"><data key="d0"><y:ShapeNode><y:NodeLabel>jdom:jdom:jar:1.0:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="631741162" target="551634178"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="628725547"><data key="d0"><y:ShapeNode><y:NodeLabel>xerces:xmlParserAPIs:jar:2.6.2:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="631741162" target="628725547"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="1370725189"><data key="d0"><y:ShapeNode><y:NodeLabel>xerces:xercesImpl:jar:2.9.1:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="631741162" target="1370725189"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="1721170154"><data key="d0"><y:ShapeNode><y:NodeLabel>xom:xom:jar:1.0b3:test</y:NodeLabel></y:ShapeNode></data></node>
<node id="1102053188"><data key="d0"><y:ShapeNode><y:NodeLabel>com.ibm.icu:icu4j:jar:2.6.1:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="1721170154" target="1102053188"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="161475341"><data key="d0"><y:ShapeNode><y:NodeLabel>xalan:xalan:jar:2.7.1:test</y:NodeLabel></y:ShapeNode></data></node>
<node id="1644210026"><data key="d0"><y:ShapeNode><y:NodeLabel>xalan:serializer:jar:2.7.1:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="161475341" target="1644210026"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<edge source="1721170154" target="161475341"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="418337386"><data key="d0"><y:ShapeNode><y:NodeLabel>org.ccil.cowan.tagsoup:tagsoup:jar:0.9.7:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="1721170154" target="418337386"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<edge source="631741162" target="1721170154"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<edge source="427956011" target="631741162"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="134986224"><data key="d0"><y:ShapeNode><y:NodeLabel>org.apache.ant:ant:jar:1.8.3:test</y:NodeLabel></y:ShapeNode></data></node>
<node id="970735536"><data key="d0"><y:ShapeNode><y:NodeLabel>org.apache.ant:ant-launcher:jar:1.8.3:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="134986224" target="970735536"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<edge source="427956011" target="134986224"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="718887293"><data key="d0"><y:ShapeNode><y:NodeLabel>org.mortbay.jetty:servlet-api-2.5:jar:6.1.14:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="427956011" target="718887293"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="595735429"><data key="d0"><y:ShapeNode><y:NodeLabel>org.mortbay.jetty:jetty:jar:6.1.14:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="427956011" target="595735429"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="956592889"><data key="d0"><y:ShapeNode><y:NodeLabel>org.mortbay.jetty:jetty-util:jar:6.1.14:test</y:NodeLabel></y:ShapeNode></data></node>
<edge source="427956011" target="956592889"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="1394103981"><data key="d0"><y:ShapeNode><y:NodeLabel>com.sun:tools:jar:0:system</y:NodeLabel></y:ShapeNode></data></node>
<edge source="427956011" target="1394103981"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>system</y:EdgeLabel></y:PolyLineEdge></data></edge>
<node id="1659019897"><data key="d0"><y:ShapeNode><y:NodeLabel>log4j:log4j:jar:1.2.17:runtime</y:NodeLabel></y:ShapeNode></data></node>
<edge source="427956011" target="1659019897"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>runtime</y:EdgeLabel></y:PolyLineEdge></data></edge>
<edge source="821406550" target="427956011"><data key="d1"><y:PolyLineEdge><y:EdgeLabel>test</y:EdgeLabel></y:PolyLineEdge></data></edge>
</graph></graphml>
Loading