Skip to content

Commit

Permalink
rebranding + tests
Browse files Browse the repository at this point in the history
  • Loading branch information
vladimir-bukhtoyarov committed Nov 5, 2015
1 parent 8121631 commit 14fe0fc
Show file tree
Hide file tree
Showing 28 changed files with 334 additions and 150 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ local.properties
.cproject

# JDT-specific (Eclipse Java Development Tools)
.classpath
.overridenClasspathUrls

# PDT-specific
.buildpath
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Spring Van Helsing
Spring Van Helsing is adressed to solve problem called as "jar hell" for springframework based application.
# Spring Jar Helsing
Spring Jar Helsing is adressed to solve problem called as "jar hell" for springframework based application.
15 changes: 10 additions & 5 deletions examples/distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.github.spring-van-helsing</groupId>
<groupId>com.github.spring-jar-helsing</groupId>
<artifactId>examples</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Expand All @@ -14,7 +14,7 @@

<dependencies>
<dependency>
<groupId>com.github.spring-van-helsing</groupId>
<groupId>com.github.spring-jar-helsing</groupId>
<artifactId>with-guavar09</artifactId>
<version>${project.version}</version>
<exclusions>
Expand All @@ -25,19 +25,24 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.github.spring-van-helsing</groupId>
<groupId>com.github.spring-jar-helsing</groupId>
<artifactId>with-guavar17</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.github.spring-van-helsing</groupId>
<artifactId>spring-van-helsing</artifactId>
<groupId>com.github.spring-jar-helsing</groupId>
<artifactId>spring-jar-helsing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
5 changes: 0 additions & 5 deletions examples/distribution/src/main/java/Dummy.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.github.springjarhelsing;

public class TestContext {

private Guava09Tester guava09Tester;
private Guava17Tester guava17Tester;

public void setGuava09Tester(Guava09Tester guava09Tester) {
this.guava09Tester = guava09Tester;
}

public Guava09Tester getGuava09Tester() {
return guava09Tester;
}

public void setGuava17Tester(Guava17Tester guava17Tester) {
this.guava17Tester = guava17Tester;
}

public Guava17Tester getGuava17Tester() {
return guava17Tester;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.github.springjarhelsing;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;

import java.util.concurrent.ExecutionException;

public class SpringJarHelsingTest {

ClassPathXmlApplicationContext applicationContext;
TestContext testContext;

@Before
public void init() {
applicationContext = new ClassPathXmlApplicationContext("test-main-context.xml");
testContext = (TestContext) applicationContext.getBean("testContext");
}

@After
public void shutdown() {
applicationContext.close();
}

@Test
public void test() throws ExecutionException, InterruptedException {
testContext.getGuava09Tester().getProperties();
testContext.getGuava17Tester().getProperties();
}

}
31 changes: 31 additions & 0 deletions examples/distribution/src/test/resources/test-main-context.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>

<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:task="http://www.springframework.org/schema/task"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">

<bean id="guava17Tester" class="com.github.springjarhelsing.Guava17Tester"/>

<bean class="com.github.springjarhelsing.JarHelsingBeanFactoryPostProcessor">
<property name="resourceLocations">
<list>
<value type="java.lang.String">classpath:test-subcontext.xml</value>
</list>
</property>
<property name="overridenClasspathUrls">
<list>
<value type="java.lang.String">file:lib/guava-r09.jar</value>
</list>
</property>
</bean>

<bean id="testContext" class="com.github.springjarhelsing.TestContext">
<property name="guava09Tester" ref="guava09Tester"/>
<property name="guava17Tester" ref="guava17Tester"/>
</bean>

</beans>
13 changes: 13 additions & 0 deletions examples/distribution/src/test/resources/test-subcontext.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>

<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:task="http://www.springframework.org/schema/task"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">

<bean id="guava09Tester" class="com.github.springjarhelsing.Guava09Tester"/>

</beans>
4 changes: 2 additions & 2 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.github.spring-van-helsing</groupId>
<groupId>com.github.spring-jar-helsing</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>examples</artifactId>
<packaging>pom</packaging>
<name>Spring Van Helsing usage example</name>
<name>Spring Jar Helsing usage example</name>

<modules>
<module>with-guavar09</module>
Expand Down
2 changes: 1 addition & 1 deletion examples/with-guavar09/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.github.spring-van-helsing</groupId>
<groupId>com.github.spring-jar-helsing</groupId>
<artifactId>examples</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Expand Down
5 changes: 0 additions & 5 deletions examples/with-guavar09/src/main/java/Dummy.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.github.springjarhelsing;

import com.google.common.util.concurrent.Futures;

import java.io.IOException;
import java.util.Properties;
import java.util.concurrent.*;

public class Guava09Tester {

public Properties getProperties() throws ExecutionException, InterruptedException {
ExecutorService executor = Executors.newSingleThreadExecutor();
Future<Properties> future = executor.submit(new Callable<Properties>() {
@Override
public Properties call() throws Exception {
return System.getProperties();
}
});

// this code can not be compiled with guava 17
future = Futures.makeUninterruptible(future);

Properties result = future.get();
executor.shutdown();
return result;
}

public String getKey() throws IOException {
Properties properties = new Properties();
properties.load(Guava09Tester.class.getResourceAsStream("example.properties"));
return properties.getProperty("key");
}

}
5 changes: 0 additions & 5 deletions examples/with-guavar09/src/test/java/DummyTest.java

This file was deleted.

Empty file.
2 changes: 1 addition & 1 deletion examples/with-guavar17/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.github.spring-van-helsing</groupId>
<groupId>com.github.spring-jar-helsing</groupId>
<artifactId>examples</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Expand Down
5 changes: 0 additions & 5 deletions examples/with-guavar17/src/main/java/Dummy.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.github.springjarhelsing;

import com.google.common.util.concurrent.Uninterruptibles;

import java.io.IOException;
import java.util.Properties;
import java.util.concurrent.*;

public class Guava17Tester {

public Properties getProperties() throws ExecutionException, InterruptedException {
ExecutorService executor = Executors.newSingleThreadExecutor();
Future<Properties> future = executor.submit(new Callable<Properties>() {
@Override
public Properties call() throws Exception {
return System.getProperties();
}
});

// this code can not be compiled with guava r09
Properties result = Uninterruptibles.getUninterruptibly(future);
executor.shutdown();
return result;
}

}
5 changes: 0 additions & 5 deletions examples/with-guavar17/src/test/java/DummyTest.java

This file was deleted.

Empty file.
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
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>

<groupId>com.github.spring-van-helsing</groupId>
<groupId>com.github.spring-jar-helsing</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>

<packaging>pom</packaging>
<name>Spring Van Helsing</name>
<name>Spring Jar Helsing</name>

<description>Spring Van Helsing is adressed to solve problem called as "jar hell" for springframework based application.</description>
<url>https://github.com/vladimir-bukhtoyarov/spring-van-helsing</url>
<description>Spring Jar Helsing is adressed to solve problem called as "jar hell" for springframework based application.</description>
<url>https://github.com/vladimir-bukhtoyarov/spring-jar-helsing</url>

<scm>
<url>https://github.com/vladimir-bukhtoyarov/spring-van-helsing</url>
<connection>scm:git:git://github.com/vladimir-bukhtoyarov/spring-van-helsing.git</connection>
<url>https://github.com/vladimir-bukhtoyarov/spring-jar-helsing</url>
<connection>scm:git:git://github.com/vladimir-bukhtoyarov/spring-jar-helsing.git</connection>
</scm>
<developers>
<developer>
Expand All @@ -33,7 +33,7 @@

<modules>
<module>examples</module>
<module>spring-van-helsing</module>
<module>spring-jar-helsing</module>
</modules>

<repositories>
Expand Down
4 changes: 2 additions & 2 deletions spring-van-helsing/pom.xml → spring-jar-helsing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.github.spring-van-helsing</groupId>
<groupId>com.github.spring-jar-helsing</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
<artifactId>spring-van-helsing</artifactId>
<artifactId>spring-jar-helsing</artifactId>

<dependencies>
<dependency>
Expand Down
Loading

0 comments on commit 14fe0fc

Please sign in to comment.