Permalink
Browse files

Flatted the project structure. Now it is just a JAR.

  • Loading branch information...
1 parent b988591 commit 35a34cdbc0eec3ccaa330ebf1c89465cdac3d73b @williewheeler committed May 22, 2012
Showing with 88 additions and 167 deletions.
  1. +2 −0 .gitignore
  2. +0 −4 kite-lib/.gitignore
  3. +0 −71 kite-lib/pom.xml
  4. +86 −92 pom.xml
  5. 0 {kite-lib → }/src/main/java/org/zkybase/kite/AbstractGuard.java
  6. 0 {kite-lib → }/src/main/java/org/zkybase/kite/Guard.java
  7. 0 {kite-lib → }/src/main/java/org/zkybase/kite/GuardCallback.java
  8. 0 {kite-lib → }/src/main/java/org/zkybase/kite/GuardedBy.java
  9. 0 {kite-lib → }/src/main/java/org/zkybase/kite/config/xml/AnnotationConfigParser.java
  10. 0 {kite-lib → }/src/main/java/org/zkybase/kite/config/xml/CircuitBreakerParser.java
  11. 0 {kite-lib → }/src/main/java/org/zkybase/kite/config/xml/ConcurrencyThrottleParser.java
  12. 0 {kite-lib → }/src/main/java/org/zkybase/kite/config/xml/GuardListAdviceParser.java
  13. 0 {kite-lib → }/src/main/java/org/zkybase/kite/config/xml/KiteNamespaceHandler.java
  14. 0 {kite-lib → }/src/main/java/org/zkybase/kite/config/xml/RateLimitingThrottleParser.java
  15. 0 {kite-lib → }/src/main/java/org/zkybase/kite/exception/CircuitOpenException.java
  16. 0 {kite-lib → }/src/main/java/org/zkybase/kite/exception/ConcurrencyLimitExceededException.java
  17. 0 {kite-lib → }/src/main/java/org/zkybase/kite/exception/GuardException.java
  18. 0 {kite-lib → }/src/main/java/org/zkybase/kite/exception/RateLimitExceededException.java
  19. 0 {kite-lib → }/src/main/java/org/zkybase/kite/exception/UnauthenticatedException.java
  20. 0 {kite-lib → }/src/main/java/org/zkybase/kite/guard/CircuitBreakerTemplate.java
  21. 0 {kite-lib → }/src/main/java/org/zkybase/kite/guard/ConcurrencyThrottleTemplate.java
  22. 0 {kite-lib → }/src/main/java/org/zkybase/kite/guard/RateLimitingThrottleTemplate.java
  23. 0 {kite-lib → }/src/main/java/org/zkybase/kite/interceptor/AnnotationGuardListSource.java
  24. 0 {kite-lib → }/src/main/java/org/zkybase/kite/interceptor/DefaultGuardListSource.java
  25. 0 {kite-lib → }/src/main/java/org/zkybase/kite/interceptor/GuardListInterceptor.java
  26. 0 {kite-lib → }/src/main/java/org/zkybase/kite/interceptor/GuardListSource.java
  27. 0 {kite-lib → }/src/main/java/org/zkybase/kite/interceptor/GuardListSourcePointcut.java
  28. 0 {kite-lib → }/src/main/resources/META-INF/spring.handlers
  29. 0 {kite-lib → }/src/main/resources/META-INF/spring.schemas
  30. 0 {kite-lib → }/src/main/resources/kite/config/kite-0.5.xsd
  31. 0 {kite-lib → }/src/main/resources/log4j.xml
  32. 0 {kite-lib → }/src/test/java/org/zkybase/kite/GuardListInterceptorTests.java
  33. 0 {kite-lib → }/src/test/java/org/zkybase/kite/guard/CircuitBreakerTemplateTests.java
  34. 0 {kite-lib → }/src/test/java/org/zkybase/kite/test/BarrierThread.java
  35. 0 {kite-lib → }/src/test/java/org/zkybase/kite/test/KiteObjectMother.java
View
@@ -1,2 +1,4 @@
/.settings
/.project
+/.classpath
+/target
View
@@ -1,4 +0,0 @@
-/.settings
-/target
-/.classpath
-/.project
View
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.zkybase.kite</groupId>
- <artifactId>kite</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <groupId>org.zkybase</groupId>
- <artifactId>kite</artifactId>
-
- <name>Kite Library</name>
- <description>The component library</description>
-
- <dependencies>
-
- <!-- Spring -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
-
- <!-- Spring Security -->
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </dependency>
-
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <!-- Test -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- </dependency>
- </dependencies>
-</project>
View
178 pom.xml
@@ -5,10 +5,10 @@
<modelVersion>4.0.0</modelVersion>
- <groupId>org.zkybase.kite</groupId>
+ <groupId>org.zkybase</groupId>
<artifactId>kite</artifactId>
<version>0.5.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<name>Kite</name>
<description>
@@ -26,6 +26,7 @@
<comments>A business-friendly OSS license</comments>
</license>
</licenses>
+
<scm>
<connection>git://github.com/williewheeler/kite.git</connection>
<developerConnection>git@github.com:williewheeler/kite.git</developerConnection>
@@ -46,11 +47,6 @@
</developer>
</developers>
- <modules>
- <module>kite-lib</module>
- <module>samples</module>
- </modules>
-
<properties>
<junit.version>4.10</junit.version>
<hamcrest.version>1.1</hamcrest.version>
@@ -60,90 +56,88 @@
<spring.security.version>3.1.0.RELEASE</spring.security.version>
</properties>
- <dependencyManagement>
- <dependencies>
+ <dependencies>
+
+ <!-- Spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <!-- Spring Security -->
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>${spring.security.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${spring.security.version}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
- <!-- Spring -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
-
- <!-- Spring Security -->
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>${spring.security.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring.security.version}</version>
- <optional>true</optional>
- </dependency>
-
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- Test -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <!-- Test -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>${hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>${hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>

0 comments on commit 35a34cd

Please sign in to comment.