Skip to content

DAO and UpdateTable #7

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 24 commits into
base: master
Choose a base branch
from
Open

DAO and UpdateTable #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e416b0e
Updated gitignore
curb47 Aug 21, 2015
b4e53b4
Work on making ChangeWatchers more generic
curb47 Aug 22, 2015
e8a4d5d
Adding ICacheDataStore interface and making RedisDataStore compatible…
curb47 Aug 26, 2015
c7aeda8
Renaming ICacheDataStore
curb47 Aug 26, 2015
fbbf45a
Cleanup
curb47 Aug 28, 2015
ce3c251
Merge branch 'auth' of github.com:ActiveStack/syncengine into changew…
curb47 Aug 28, 2015
0162c1b
Started on update table stuff
jonnysamps Sep 2, 2015
681720d
Merge branch 'updatetable' of github.com:ActiveStack/syncengine into …
curb47 Sep 3, 2015
4c02768
wip
curb47 Sep 3, 2015
781b370
Added some test infrastructure
jonnysamps Sep 4, 2015
6f3e57a
Update table: individual record updates, inserts, deletes
jonnysamps Sep 6, 2015
74e4254
Added redis set for class->objID
jonnysamps Sep 8, 2015
d53729c
Removed bad comment
jonnysamps Sep 8, 2015
4d1c298
Finished routines to maintain class access journals
jonnysamps Sep 9, 2015
8b603e4
Implemented whole table update
jonnysamps Sep 10, 2015
dc246d2
Full table update
jonnysamps Sep 12, 2015
f51f320
Started adding the java test client
jonnysamps Sep 16, 2015
77fbf0f
wip
curb47 Sep 16, 2015
6233201
wip
curb47 Sep 16, 2015
1192c09
Merge branch 'refs/heads/updatetable' into dao
curb47 Sep 17, 2015
d9da781
wip - updateTable
curb47 Sep 17, 2015
5c2269d
wip
curb47 Sep 17, 2015
f71c701
Wrapping up work for UpdateTable
curb47 Sep 17, 2015
87fa556
Merge branch 'master' of github.com:ActiveStack/syncengine into dao
curb47 Sep 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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ target/

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

/.classpath
/.project
/.settings/
32 changes: 29 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@

<modelVersion>4.0.0</modelVersion>

<groupId>io.activestack</groupId>
<groupId>org.activestack</groupId>
<artifactId>syncengine</artifactId>
<version>1.1.16-SNAPSHOT</version>
<version>1.1.17-updatetable-SNAPSHOT</version>

<properties>
<spring.version>3.2.4.RELEASE</spring.version>
<aspectj.version>1.6.11</aspectj.version>
<slf4j.version>1.6.1</slf4j.version>
<project.http.version>1.19.0</project.http.version>
<project.oauth.version>1.19.0</project.oauth.version>
<mockito-core.version>1.9.5</mockito-core.version>
</properties>

<dependencies>
Expand All @@ -34,6 +35,12 @@
<version>4.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito-core.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.codehaus.jackson</groupId>
Expand Down Expand Up @@ -244,7 +251,10 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-oauth2</artifactId>
<version>v2-rev78-1.19.0</version>
<!--
<version>v2-rev94-1.20.0</version>
-->
<version>v2-rev78-1.19.0</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
Expand Down Expand Up @@ -293,6 +303,20 @@
</dependency>
</dependencies>

<build>
<plugins>
<!-- we want JDK 1.6 source and binary compatiblility -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>

<repositories>
<repository>
<id>com.springsource.repository.bundles.release</id>
Expand All @@ -315,4 +339,6 @@
<url>http://maven.springframework.org/release</url>
</repository>
</repositories>


</project>
167 changes: 0 additions & 167 deletions src/main/java/com/convergys/pulse/service/PulseHttpAuthProvider.java
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions src/main/java/com/convergys/pulse/service/PulseHttpAuthProviderFactory.java
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions src/main/java/com/convergys/pulse/vo/PulseUserInfo.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/main/java/com/percero/agents/auth/services/AuthProviderRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void addProvider(IAuthProvider provider){
if(providerMap.containsKey(provider.getID()))
logger.warn("Non-unique auth provider ID: "+provider.getID());

providerMap.put(provider.getID(), provider);
providerMap.put(provider.getID().toLowerCase(), provider);
}

/**
Expand All @@ -44,7 +44,7 @@ public void addProvider(IAuthProvider provider){
* @return
*/
public IAuthProvider getProvider(String ID){
return providerMap.get(ID);
return providerMap.get(ID.toLowerCase());
}

/**
Expand All @@ -53,6 +53,6 @@ public IAuthProvider getProvider(String ID){
* @return
*/
public boolean hasProvider(String ID){
return providerMap.containsKey(ID);
return providerMap.containsKey(ID.toLowerCase());
}
}
Loading