mariusz.pacek/SpringRest
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mearge

Browse Source 
Merge branch 'master' of https://github.com/lukasgol/SpringRest
This commit is contained in:
lukasgol committed 2014-04-27 22:53:04 +02:00
2 parents 8b8726589e 692ee08f47
commit 2be2cdf064
3 files changed
+33 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
+1
View File
@@ -3,3 +3,4 @@
.gradle
/.idea/**
*.iml
build
NFCServer.iml
+31 -7
View File
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web Gradle : NFCServer.war">
<configuration>
<webroots />
@@ -26,10 +23,14 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="Gradle: spring-boot-starter-web-1.0.0.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: jackson-databind-2.3.2" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-webmvc-4.0.3.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-boot-starter-data-jpa-1.0.0.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: h2-1.3.175" level="project" />
<orderEntry type="library" exported="" name="Gradle: json-20080701" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-boot-starter-web-1.0.0.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-core-4.0.3.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: jackson-annotations-2.3.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: jackson-core-2.3.2" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-logging-1.1.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-beans-4.0.3.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: aopalliance-1.0" level="project" />
@@ -46,14 +47,37 @@
<orderEntry type="library" exported="" name="Gradle: logback-classic-1.1.1" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-boot-starter-logging-1.0.0.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-boot-starter-1.0.0.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: aspectjrt-1.7.4" level="project" />
<orderEntry type="library" exported="" name="Gradle: aspectjweaver-1.7.4" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-boot-starter-aop-1.0.0.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: snakeyaml-1.13" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-tx-4.0.3.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-jdbc-4.0.3.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: tomcat-juli-7.0.52" level="project" />
<orderEntry type="library" exported="" name="Gradle: tomcat-jdbc-7.0.52" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-boot-starter-jdbc-1.0.0.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: jboss-logging-3.1.3.GA" level="project" />
<orderEntry type="library" exported="" name="Gradle: jboss-logging-annotations-1.2.0.Beta1" level="project" />
<orderEntry type="library" exported="" name="Gradle: xml-apis-1.0.b2" level="project" />
<orderEntry type="library" exported="" name="Gradle: dom4j-1.6.1" level="project" />
<orderEntry type="library" exported="" name="Gradle: hibernate-commons-annotations-4.0.4.Final" level="project" />
<orderEntry type="library" exported="" name="Gradle: hibernate-jpa-2.1-api-1.0.0.Final" level="project" />
<orderEntry type="library" exported="" name="Gradle: jboss-transaction-api_1.2_spec-1.0.0.Final" level="project" />
<orderEntry type="library" exported="" name="Gradle: javassist-3.18.1-GA" level="project" />
<orderEntry type="library" exported="" name="Gradle: antlr-2.7.7" level="project" />
<orderEntry type="library" exported="" name="Gradle: jandex-1.1.0.Final" level="project" />
<orderEntry type="library" exported="" name="Gradle: hibernate-core-4.3.1.Final" level="project" />
<orderEntry type="library" exported="" name="Gradle: hibernate-entitymanager-4.3.1.Final" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-orm-4.0.3.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-data-commons-1.7.1.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-data-jpa-1.5.1.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-aspects-4.0.3.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: tomcat-embed-core-7.0.52" level="project" />
<orderEntry type="library" exported="" name="Gradle: tomcat-embed-el-7.0.52" level="project" />
<orderEntry type="library" exported="" name="Gradle: tomcat-embed-logging-juli-7.0.52" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-boot-starter-tomcat-1.0.0.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: jackson-annotations-2.3.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: jackson-core-2.3.2" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-web-4.0.3.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-webmvc-4.0.3.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: junit-4.11" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: hamcrest-core-1.3" level="project" />
</component>
src/main/resources/Spring-Module.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<bean id="mbeanServer" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry">
<property name="objectName" value="connector:name=rmi"/>
<property name="serviceUrl"
value="service:jmx:rmi://msi-ge600/jndi/rmi://msi-ge600:1099/myconnector"/>
value="service:jmx:rmi://localhost/jndi/rmi://localhost:1099/myconnector"/>
</bean>
<bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean">
<property name="port" value="1099"/>