Skip to content

property override and shiro default #2

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
simonjupp wants to merge 8 commits into
base: master
Choose a base branch
from
Open

property override and shiro default #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9ef3596
new property file config handling
simonjupp May 8, 2015
0e21468
added default shiro config
simonjupp May 11, 2015
456cdd5
moved tests and dependancies to test scope
simonjupp May 13, 2015
c763d9f
removed tests and dependancies on archive
simonjupp May 13, 2015
9a39b24
removed dependancy on fuseki that was bringing in jetty servlet
simonjupp May 13, 2015
7582f80
added jms-api
simonjupp May 13, 2015
50d35c2
made activemq client non optional
simonjupp May 14, 2015
ca16c91
removed all optional activemq deps
simonjupp May 14, 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
108 changes: 18 additions & 90 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,12 @@
<groupId>com.openlink.virtuoso</groupId>
<artifactId>virtjdbc4-1</artifactId>
<version>7.1.0</version>
</dependency>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20131018</version>
</dependency>
<dependency>
<groupId>diachron-athena</groupId>
<artifactId>archive-data-mapping</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>diachron-athena</groupId>
<artifactId>archive-system</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
Expand All @@ -54,7 +44,7 @@
<groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi-distribution</artifactId>
<version>3.4.10</version>
</dependency>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
Expand All @@ -65,12 +55,12 @@
<groupId>com.hermit-reasoner</groupId>
<artifactId>org.semanticweb.hermit</artifactId>
<version>1.3.8.3</version>
</dependency>
</dependency>
<dependency>
<groupId>com.openlink.virtuoso</groupId>
<artifactId>virt_jena2</artifactId>
<version>7.1.0</version>
</dependency>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
Expand All @@ -85,178 +75,112 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-openwire-legacy</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-camel</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jaas</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-console</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-shiro</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-spring</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pool</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jms-pool</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-amqp</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-stomp</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jdbc-store</artifactId>
<version>5.10.0</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq.protobuf</groupId>
<artifactId>activemq-protobuf</artifactId>
<version>1.1</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.fusesource.hawtbuf</groupId>
<artifactId>hawtbuf</artifactId>
<version>1.10</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId>
<version>1.9.1</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>1.1.1</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
<version>1.0.1</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
<version>1.1.1</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<classifier>sources</classifier>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -301,11 +225,11 @@
<artifactId>jersey-json</artifactId>
<version>1.18.1</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>1.18.1</version>
</dependency>
<!--<dependency>-->
<!--<groupId>com.sun.jersey</groupId>-->
<!--<artifactId>jersey-server</artifactId>-->
<!--<version>1.18.1</version>-->
<!--</dependency>-->
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
Expand Down Expand Up @@ -359,11 +283,15 @@
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki</artifactId>
<version>1.1.0</version>
</dependency>

<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Expand Down
1 change: 0 additions & 1 deletion ...chron/integration/diachronintegrationlayer/services/complexchanges/ApplicationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ private void addRestResourceClasses(Set<Class<?>> resources) {
resources.add(com.diachron.integration.services.evaluation.DispatcherEvaluateResource.class);
resources.add(com.diachron.integration.services.evaluation.EvaluateResource.class);
resources.add(com.diachron.integration.services.evaluation.UnqueueEvaluateResource.class);
resources.add(rdfization.RdfizeProcessResource.class);
}

}
15 changes: 10 additions & 5 deletions src/main/java/management/configuration/PropertiesManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package management.configuration;

import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.*;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand All @@ -24,9 +21,17 @@ public static PropertiesManager getPropertiesManager()
{
try {
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
InputStream input = classLoader.getResourceAsStream(initFilePath);
InputStream input = classLoader.getResourceAsStream(initFilePath);
prop = new Properties();
prop.load(input);

if (System.getProperty("diachron.config.location") != null) {
InputStream overideInput = new FileInputStream(new File(System.getProperty("diachron.config.location")));
Properties override = new Properties();
override.load(overideInput);
prop.putAll(override);
}

propManager = new PropertiesManager();
} catch (FileNotFoundException ex) {
Logger.getLogger(PropertiesManager.class.getName()).log(Level.SEVERE, null, ex);
Expand Down
Loading