Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:eitch/li.strolch.agent.git

This commit is contained in:
Robert von Burg 2014-03-19 20:28:16 +01:00
parent 8f382caac6 b50863d897
commit 54375f1b8d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -14,19 +14,19 @@
<name>li.strolch.agent</name> <name>li.strolch.agent</name>
<description>Strolch Agent which is the runtime for Strolch</description> <description>Strolch Agent which is the runtime for Strolch</description>
<url>https://github.com/eitch/li.strolch.agent</url> <url>https://github.com/eitchnet/li.strolch.agent</url>
<inceptionYear>2011</inceptionYear> <inceptionYear>2011</inceptionYear>
<issueManagement> <issueManagement>
<system>Github Issues</system> <system>Github Issues</system>
<url>https://github.com/eitch/li.strolch.agent/issues</url> <url>https://github.com/eitchnet/li.strolch.agent/issues</url>
</issueManagement> </issueManagement>
<scm> <scm>
<connection>scm:git:https://github.com/eitch/li.strolch.agent.git</connection> <connection>scm:git:https://github.com/eitchnet/li.strolch.agent.git</connection>
<developerConnection>scm:git:git@github.com:eitch/li.strolch.agent.git</developerConnection> <developerConnection>scm:git:git@github.com:eitch/li.strolch.agent.git</developerConnection>
<url>https://github.com/eitch/li.strolch.agent</url> <url>https://github.com/eitchnet/li.strolch.agent</url>
</scm> </scm>
<dependencies> <dependencies>

5
src/main/java/li/strolch/service/api/AbstractService.java
View File

@ -18,7 +18,6 @@ package li.strolch.service.api;
import java.text.MessageFormat; import java.text.MessageFormat;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
import li.strolch.agent.api.RealmHandler;
import li.strolch.agent.api.StrolchRealm; import li.strolch.agent.api.StrolchRealm;
import li.strolch.exception.StrolchException; import li.strolch.exception.StrolchException;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
@ -79,11 +78,11 @@ public abstract class AbstractService<T extends ServiceArgument, U extends Servi
} }
protected StrolchRealm getRealm(String realm) { protected StrolchRealm getRealm(String realm) {
return getComponent(RealmHandler.class).getRealm(realm); return this.container.getRealm(realm);
} }
protected StrolchTransaction openTx(String realm) { protected StrolchTransaction openTx(String realm) {
return getComponent(RealmHandler.class).getRealm(realm).openTx(); return this.container.getRealm(realm).openTx();
} }
@Override @Override