Skip to content

GitLab

Commit aadf87c8 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

build-deploy fixed on linux

parent 4b063e79
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ aadf87c8
......@@ -9,4 +9,6 @@ web/src/main/webapp/svnversion.txt
*.war
/target/
service/minerva-big/
npm-debug.log
\ No newline at end of file
npm-debug.log
.idea/workspace.xml
.idea/.name 0 → 100644
View file @ aadf87c8
parent
\ No newline at end of file
.idea/artifacts/web_war.xml 0 → 100644
View file @ aadf87c8
<component name="ArtifactManager">
<artifact type="war" name="web:war">
<output-path>$PROJECT_DIR$/web/target</output-path>
<root id="archive" name="web-1.0.war">
<element id="artifact" artifact-name="web:war exploded" />
</root>
</artifact>
</component>
\ No newline at end of file
.idea/artifacts/web_war_exploded.xml 0 → 100644
View file @ aadf87c8
<component name="ArtifactManager">
<artifact type="exploded-war" name="web:war exploded">
<output-path>$PROJECT_DIR$/web/target/web-1.0</output-path>
<root id="root">
<element id="directory" name="WEB-INF">
<element id="directory" name="classes">
<element id="module-output" name="web" />
</element>
<element id="directory" name="lib">
<element id="archive" name="service-1.0.jar">
<element id="module-output" name="service" />
</element>
<element id="archive" name="model-1.0.jar">
<element id="module-output" name="model" />
</element>
<element id="archive" name="commons-1.0.jar">
<element id="module-output" name="commons" />
</element>
<element id="library" level="project" name="Maven: commons-io:commons-io:2.4" />
<element id="library" level="project" name="Maven: org.hibernate:hibernate-core:4.1.0.Final" />
<element id="library" level="project" name="Maven: commons-collections:commons-collections:3.2.1" />
<element id="library" level="project" name="Maven: antlr:antlr:2.7.7" />
<element id="library" level="project" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" />
<element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
<element id="library" level="project" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final" />
<element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.1.0.CR2" />
<element id="library" level="project" name="Maven: org.javassist:javassist:3.15.0-GA" />
<element id="library" level="project" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.1.Final" />
<element id="library" level="project" name="Maven: xml-apis:xml-apis:1.4.01" />
<element id="library" level="project" name="Maven: org.reflections:reflections:0.9.9-RC1" />
<element id="library" level="project" name="Maven: com.google.guava:guava:11.0.2" />
<element id="library" level="project" name="Maven: com.google.code.findbugs:jsr305:1.3.9" />
<element id="archive" name="persist-1.0.jar">
<element id="module-output" name="persist" />
</element>
<element id="library" level="project" name="Maven: commons-net:commons-net:3.5" />
<element id="library" level="project" name="Maven: postgresql:postgresql:9.1-901.jdbc4" />
<element id="archive" name="model-command-1.0.jar">
<element id="module-output" name="model-command" />
</element>
<element id="archive" name="annotation-1.0.jar">
<element id="module-output" name="annotation" />
</element>
<element id="archive" name="converter-1.0.jar">
<element id="module-output" name="converter" />
</element>
<element id="library" level="project" name="Maven: xerces:xercesImpl:2.11.0" />
<element id="library" level="project" name="Maven: uk.ac.ebi.chebi.webapps.chebiWS.client:chebiWS-client:2.2.2" />
<element id="library" level="project" name="Maven: com.sun.xml.ws:jaxws-rt:2.1.7" />
<element id="library" level="project" name="Maven: com.sun.xml.stream.buffer:streambuffer:0.9" />
<element id="library" level="project" name="Maven: org.codehaus.woodstox:wstx-asl:3.2.3" />
<element id="library" level="project" name="Maven: org.jvnet.staxex:stax-ex:1.2" />
<element id="library" level="project" name="Maven: javax.xml.stream:stax-api:1.0" />
<element id="library" level="project" name="Maven: com.sun.org.apache.xml.internal:resolver:20050927" />
<element id="library" level="project" name="Maven: org.jvnet:mimepull:1.3" />
<element id="library" level="project" name="Maven: javax.xml.ws:jaxws-api:2.1" />
<element id="library" level="project" name="Maven: com.sun.xml.ws:jaxws-tools:2.1.3" />
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-xjc:2.1.6" />
<element id="library" level="project" name="Maven: com.sun.xml.messaging.saaj:saaj-impl:1.3.2" />
<element id="library" level="project" name="Maven: javax.xml.soap:saaj-api:1.3" />
<element id="library" level="project" name="Maven: uk.ac.ebi.miriam:miriam-lib:1.1.5" />
<element id="library" level="project" name="Maven: axis:axis:1.4" />
<element id="library" level="project" name="Maven: org.apache.axis:axis-jaxrpc:1.4" />
<element id="library" level="project" name="Maven: org.apache.axis:axis-saaj:1.4" />
<element id="library" level="project" name="Maven: axis:axis-wsdl4j:1.5.1" />
<element id="library" level="project" name="Maven: commons-discovery:commons-discovery:0.2" />
<element id="library" level="project" name="Maven: javax.activation:activation:1.1" />
<element id="library" level="project" name="Maven: javax.mail:mail:1.4" />
<element id="library" level="project" name="Maven: org.apache.httpcomponents:httpclient:4.4" />
<element id="library" level="project" name="Maven: org.apache.httpcomponents:httpmime:4.4" />
<element id="library" level="project" name="Maven: org.apache.httpcomponents:httpcore:4.4" />
<element id="library" level="project" name="Maven: javax.xml.bind:jaxb-api:2.2.7" />
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.7" />
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-core:2.2.7" />
<element id="library" level="project" name="Maven: com.sun.istack:istack-commons-runtime:2.16" />
<element id="library" level="project" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.12" />
<element id="library" level="project" name="Maven: javax.xml.bind:jsr173_api:1.0" />
<element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.12" />
<element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" />
<element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
<element id="archive" name="converter-CellDesigner-1.0.jar">
<element id="module-output" name="converter-CellDesigner" />
</element>
<element id="archive" name="converter-SBGNML-1.0.jar">
<element id="module-output" name="converter-SBGNML" />
</element>
<element id="library" level="project" name="Maven: org.sbgn:libsbgn:0.2" />
<element id="library" level="project" name="Maven: commons-cli:commons-cli:1.2" />
<element id="archive" name="converter-graphics-1.0.jar">
<element id="module-output" name="converter-graphics" />
</element>
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-rasterizer:1.8" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-parser:1.8" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-xml:1.8" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.8" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-anim:1.8" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-css:1.8" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-ext:1.8" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.8" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-bridge:1.8" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-script:1.8" />
<element id="library" level="project" name="Maven: xalan:xalan:2.7.0" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-dom:1.8" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-gvt:1.8" />
<element id="library" level="project" name="Maven: xml-apis:xml-apis-ext:1.3.04" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-util:1.8" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-svggen:1.8" />
<element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.8" />
<element id="library" level="project" name="Maven: com.itextpdf:itextpdf:5.5.6" />
<element id="library" level="project" name="Maven: com.google.code.gson:gson:2.2.2" />
<element id="library" level="project" name="Maven: org.apache.poi:poi:3.12" />
<element id="library" level="project" name="Maven: commons-codec:commons-codec:1.9" />
<element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml:3.12" />
<element id="archive" name="rest-api-1.0.jar">
<element id="module-output" name="rest-api" />
</element>
<element id="library" level="project" name="Maven: com.sun.jersey:jersey-server:1.18.1" />
<element id="library" level="project" name="Maven: com.sun.jersey:jersey-core:1.18.1" />
<element id="library" level="project" name="Maven: com.sun.jersey:jersey-servlet:1.18.1" />
<element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.8" />
<element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.8" />
<element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" />
<element id="archive" name="frontend-js-1.0.jar">
<element id="module-output" name="frontend-js" />
</element>
<element id="library" level="project" name="Maven: com.sun.faces:jsf-api:2.1.7" />
<element id="library" level="project" name="Maven: com.sun.faces:jsf-impl:2.1.7" />
<element id="library" level="project" name="Maven: javax.servlet:jstl:1.2" />
<element id="library" level="project" name="Maven: org.primefaces:primefaces:4.0" />
<element id="library" level="project" name="Maven: org.primefaces.themes:home:1.0.8" />
<element id="library" level="project" name="Maven: org.springframework.webflow:spring-faces:2.4.2.RELEASE" />
<element id="library" level="project" name="Maven: commons-logging:commons-logging:1.1.1" />
<element id="library" level="project" name="Maven: org.springframework.webflow:spring-binding:2.4.2.RELEASE" />
<element id="library" level="project" name="Maven: opensymphony:ognl:2.6.11" />
<element id="library" level="project" name="Maven: org.springframework.webflow:spring-webflow:2.4.2.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework.webflow:spring-js:2.4.2.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework.webflow:spring-js-resources:2.4.2.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-beans:4.2.0.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-expression:4.2.0.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-context:4.2.0.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-aop:4.2.0.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-core:4.2.0.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-web:4.2.0.RELEASE" />
<element id="library" level="project" name="Maven: log4j:log4j:1.2.17" />
<element id="library" level="project" name="Maven: org.springframework:spring-tx:4.2.0.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-orm:4.2.0.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.2.0.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-test:4.2.0.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.2.0.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework.security:spring-security-taglibs:4.0.2.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework.security:spring-security-acl:4.0.2.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework.security:spring-security-config:4.0.2.RELEASE" />
<element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
<element id="library" level="project" name="Maven: org.springframework.security:spring-security-web:4.0.2.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework.security:spring-security-core:4.0.2.RELEASE" />
<element id="library" level="project" name="Maven: c3p0:c3p0:0.9.1.2" />
<element id="library" level="project" name="Maven: cglib:cglib:2.2.2" />
<element id="library" level="project" name="Maven: asm:asm:3.3.1" />
<element id="library" level="project" name="Maven: commons-fileupload:commons-fileupload:1.2.2" />
<element id="library" level="project" name="Maven: org.primefaces.extensions:primefaces-extensions:0.7.1" />
<element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.1" />
<element id="library" level="project" name="Maven: commons-validator:commons-validator:1.4.0" />
<element id="library" level="project" name="Maven: commons-beanutils:commons-beanutils:1.8.3" />
<element id="library" level="project" name="Maven: commons-digester:commons-digester:1.8" />
<element id="library" level="project" name="Maven: junit:junit:4.12" />
<element id="library" level="project" name="Maven: org.hamcrest:hamcrest-core:1.3" />
</element>
</element>
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/web/target/web-1.0/META-INF/MANIFEST.MF" />
</element>
<element id="javaee-facet-resources" facet="web/web/Web" />
</root>
</artifact>
</component>
\ No newline at end of file
.idea/compiler.xml 0 → 100644
View file @ aadf87c8
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="annotation" />
<module name="CellDesigner-plugin" />
<module name="commons" />
<module name="comparison" />
<module name="console" />
<module name="converter" />
<module name="converter-CellDesigner" />
<module name="converter-graphics" />
<module name="converter-SBGNML" />
<module name="editor" />
<module name="frontend-js" />
<module name="model" />
<module name="model-command" />
<module name="pathvisio" />
<module name="persist" />
<module name="quadTrees" />
<module name="reactome" />
<module name="rest-api" />
<module name="service" />
<module name="web" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="annotation" target="1.8" />
<module name="CellDesigner-plugin" target="1.8" />
<module name="commons" target="1.8" />
<module name="comparison" target="1.8" />
<module name="console" target="1.8" />
<module name="converter" target="1.8" />
<module name="converter-CellDesigner" target="1.8" />
<module name="converter-graphics" target="1.8" />
<module name="converter-SBGNML" target="1.8" />
<module name="editor" target="1.8" />
<module name="frontend-js" target="1.8" />
<module name="model" target="1.8" />
<module name="model-command" target="1.8" />
<module name="parent" target="1.5" />
<module name="pathvisio" target="1.8" />
<module name="persist" target="1.8" />
<module name="quadTrees" target="1.8" />
<module name="reactome" target="1.8" />
<module name="rest-api" target="1.8" />
<module name="service" target="1.8" />
<module name="web" target="1.8" />
</bytecodeTargetLevel>
</component>
</project>
\ No newline at end of file
.idea/encodings.xml 0 → 100644
View file @ aadf87c8
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/CellDesigner-plugin" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/annotation" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/commons" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/comparison" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/console" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/converter" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/converter-CellDesigner" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/converter-SBGNML" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/converter-graphics" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/editor" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/frontend-js" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/model" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/model-command" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pathvisio" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/persist" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/quadTrees" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/reactome" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/rest-api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/service" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/web" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
.idea/modules.xml 0 → 100644
View file @ aadf87c8
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/CellDesigner-plugin/CellDesigner-plugin.iml" filepath="$PROJECT_DIR$/CellDesigner-plugin/CellDesigner-plugin.iml" />
<module fileurl="file://$PROJECT_DIR$/annotation/annotation.iml" filepath="$PROJECT_DIR$/annotation/annotation.iml" />
<module fileurl="file://$PROJECT_DIR$/commons/commons.iml" filepath="$PROJECT_DIR$/commons/commons.iml" />
<module fileurl="file://$PROJECT_DIR$/comparison/comparison.iml" filepath="$PROJECT_DIR$/comparison/comparison.iml" />
<module fileurl="file://$PROJECT_DIR$/console/console.iml" filepath="$PROJECT_DIR$/console/console.iml" />
<module fileurl="file://$PROJECT_DIR$/converter/converter.iml" filepath="$PROJECT_DIR$/converter/converter.iml" />
<module fileurl="file://$PROJECT_DIR$/converter-CellDesigner/converter-CellDesigner.iml" filepath="$PROJECT_DIR$/converter-CellDesigner/converter-CellDesigner.iml" />
<module fileurl="file://$PROJECT_DIR$/converter-SBGNML/converter-SBGNML.iml" filepath="$PROJECT_DIR$/converter-SBGNML/converter-SBGNML.iml" />
<module fileurl="file://$PROJECT_DIR$/converter-graphics/converter-graphics.iml" filepath="$PROJECT_DIR$/converter-graphics/converter-graphics.iml" />
<module fileurl="file://$PROJECT_DIR$/editor/editor.iml" filepath="$PROJECT_DIR$/editor/editor.iml" />
<module fileurl="file://$PROJECT_DIR$/frontend-js/frontend-js.iml" filepath="$PROJECT_DIR$/frontend-js/frontend-js.iml" />
<module fileurl="file://$PROJECT_DIR$/model/model.iml" filepath="$PROJECT_DIR$/model/model.iml" />
<module fileurl="file://$PROJECT_DIR$/model-command/model-command.iml" filepath="$PROJECT_DIR$/model-command/model-command.iml" />
<module fileurl="file://$PROJECT_DIR$/parent.iml" filepath="$PROJECT_DIR$/parent.iml" />
<module fileurl="file://$PROJECT_DIR$/pathvisio/pathvisio.iml" filepath="$PROJECT_DIR$/pathvisio/pathvisio.iml" />
<module fileurl="file://$PROJECT_DIR$/persist/persist.iml" filepath="$PROJECT_DIR$/persist/persist.iml" />
<module fileurl="file://$PROJECT_DIR$/quadTrees/quadTrees.iml" filepath="$PROJECT_DIR$/quadTrees/quadTrees.iml" />
<module fileurl="file://$PROJECT_DIR$/reactome/reactome.iml" filepath="$PROJECT_DIR$/reactome/reactome.iml" />
<module fileurl="file://$PROJECT_DIR$/rest-api/rest-api.iml" filepath="$PROJECT_DIR$/rest-api/rest-api.iml" />
<module fileurl="file://$PROJECT_DIR$/service/service.iml" filepath="$PROJECT_DIR$/service/service.iml" />
<module fileurl="file://$PROJECT_DIR$/web/web.iml" filepath="$PROJECT_DIR$/web/web.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml 0 → 100644
View file @ aadf87c8
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
CellDesigner-plugin/CellDesigner-plugin.iml 0 → 100644
View file @ aadf87c8
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="model" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.0.CR2" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.15.0-GA" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
<orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" name="Maven: org.reflections:reflections:0.9.9-RC1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="module" module-name="commons" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
<orderEntry type="module" module-name="converter-CellDesigner" />
<orderEntry type="module" module-name="converter" />
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
<orderEntry type="library" name="Maven: jp.sbi:celldesigner:4.4" level="project" />
<orderEntry type="library" name="Maven: org.sbml:libsbml:1.0" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
</component>
</module>
\ No newline at end of file
annotation/annotation.iml 0 → 100644
View file @ aadf87c8
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="model" />
<orderEntry type="module" module-name="commons" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.0.CR2" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.15.0-GA" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
<orderEntry type="library" name="Maven: org.reflections:reflections:0.9.9-RC1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="module" module-name="persist" />
<orderEntry type="library" name="Maven: commons-net:commons-net:3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:4.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-taglibs:4.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-acl:4.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:4.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:4.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:4.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901.jdbc4" level="project" />
<orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.2" level="project" />
<orderEntry type="library" name="Maven: cglib:cglib:2.2.2" level="project" />
<orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.2" level="project" />
<orderEntry type="module" module-name="converter-CellDesigner" />
<orderEntry type="module" module-name="converter" />
<orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
<orderEntry type="library" name="Maven: uk.ac.ebi.chebi.webapps.chebiWS.client:chebiWS-client:2.2.2" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.ws:jaxws-rt:2.1.7" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.stream.buffer:streambuffer:0.9" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.woodstox:wstx-asl:3.2.3" level="project" />
<orderEntry type="library" name="Maven: org.jvnet.staxex:stax-ex:1.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0" level="project" />
<orderEntry type="library" name="Maven: com.sun.org.apache.xml.internal:resolver:20050927" level="project" />
<orderEntry type="library" name="Maven: org.jvnet:mimepull:1.3" level="project" />
<orderEntry type="library" name="Maven: javax.xml.ws:jaxws-api:2.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.ws:jaxws-tools:2.1.3" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-xjc:2.1.6" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.messaging.saaj:saaj-impl:1.3.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.soap:saaj-api:1.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: uk.ac.ebi.miriam:miriam-lib:1.1.5" level="project" />
<orderEntry type="library" name="Maven: axis:axis:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: axis:axis-wsdl4j:1.5.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: commons-discovery:commons-discovery:0.2" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.4" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.7" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.7" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.7" level="project" />
<orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:2.16" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.12" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jsr173_api:1.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.10.19" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
</component>
</module>
\ No newline at end of file
build.xml
View file @ aadf87c8
<?xml version="1.0" encoding="UTF-8"?>
<project name="minerva" default="main" basedir=".">
<property environment="env"/>
<property name="build.dir" value="web/target" />
<property name="war.file" value="web-1.0.war" />
<property name="tomcat.home" value="${env.CATALINA_HOME}" />
<property name="tomcat.deploy.dir" value="${tomcat.home}/webapps" />
<condition property="isWindows">
<os family="windows" />
</condition>
<condition property="isUnix">
<os family="unix" />
</condition>
<target name="war-exists">
<available file="${tomcat.deploy.dir}/${ant.project.name}.war" property="war.exists"/>
</target>
<target name="remove-war" depends="war-exists" if="war.exists">
<delete file="${tomcat.deploy.dir}/${ant.project.name}.war" />
</target>
<target name="war-dir-exists">
<available file="${tomcat.deploy.dir}/${ant.project.name}" property="war-dir.exists" type="dir"/>
</target>
<target name="remove-war-dir" depends="war-dir-exists" if="war-dir.exists">
<delete dir="${tomcat.deploy.dir}/${ant.project.name}" />
</target>
<target name="deploy" depends="remove-war,remove-war-dir">
<copy file="${build.dir}/${war.file}" todir="${tomcat.deploy.dir}" />
<move file="${tomcat.deploy.dir}/${war.file}" tofile="${tomcat.deploy.dir}/${ant.project.name}.war"/>
</target>
<target name="main" depends="tomcat-stop,maven-build,deploy,tomcat-start">
</target>
<target name="all" depends="main">
</target>
<target name="tomcat-start">
<exec executable="${tomcat.home}/bin/startup.bat">
</exec>
</target>
<target name="tomcat-stop">
<exec executable="${tomcat.home}/bin/shutdown.bat">
</exec>
</target>
<target name="maven-build" depends="gitversion, maven-build-windows, maven-build-unix"/>
<target name="maven-build-windows" if="isWindows">
<exec dir="." executable="cmd" >
<arg line="/c mvn -Dmaven.test.skip=true clean install -pl web -am" />
</exec>
</target>
<target name="maven-build-unix" if="isUnix">
<exec dir="." executable="sh" >
<arg line="-c 'mvn -Dmaven.test.skip=true clean install -pl web -am'" />
</exec>
</target>
<target name="maven-test" depends="maven-test-windows, maven-test-unix"/>
<target name="maven-test-windows" depends="maven-build" if="isWindows">
<exec dir="." executable="cmd" >
<arg line="/c mvn test -fn" />
<!-- <arg line="/c mvn surefire-report:report" /> -->
</exec>
</target>
<target name="maven-test-unix" depends="maven-build" if="isUnix">
<exec dir="." executable="sh" >
<arg line="-c 'mvn test -fn'" />
<!-- <arg line="-c 'mvn surefire-report:report'" /> -->
</exec>
</target>
<target name="deployMapFiles">
<copy todir="${tomcat.deploy.dir}/map_images">
<fileset dir="map_images" />
</copy>
</target>
<target name="gitversion">
<exec executable="git" outputproperty="gitversion">
<arg value="rev-parse"/>
<arg value="HEAD"/>
</exec>
<tstamp>
<format property="build.time" pattern="dd/MM/yyyy HH:mm"
unit="hour"/>
</tstamp>
<echo >GIT Version: ${gitversion}
Build timestamp: ${build.time}</echo>
<echo file="web/src/main/webapp/version.txt">${gitversion}
${build.time}</echo>
<copy file="CHANGELOG" tofile="web/src/main/webapp/CHANGELOG" overwrite="true"/>
</target>
<target name="debian-pkg" depends="maven-build">
<exec executable="debian/create-debian-pkg.sh"/>
</target>
<property environment="env"/>
<property name="build.dir" value="web/target"/>
<property name="war.file" value="web-1.0.war"/>
<property name="tomcat.home" value="${env.CATALINA_HOME}"/>
<property name="tomcat.deploy.dir" value="${tomcat.home}/webapps"/>