Browse Source

clean up code

Nick Kasvosve 10 years ago
parent
commit
3ae54e8e35

+ 11 - 15
frameworks/Java/beyondj/beyondj-launcher/src/main/resources/config/spring/core-jpa-spring-config.xml

@@ -3,15 +3,12 @@
         xmlns="http://www.springframework.org/schema/beans"
         xmlns="http://www.springframework.org/schema/beans"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns:jpa="http://www.springframework.org/schema/data/jpa"
         xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-        xmlns:conditional="http://lenox.com/beyondj/profile"
         xsi:schemaLocation="http://www.springframework.org/schema/beans
         xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
         http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
         http://www.springframework.org/schema/tx
         http://www.springframework.org/schema/tx
         http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
         http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
         http://www.springframework.org/schema/data/jpa
         http://www.springframework.org/schema/data/jpa
-        http://www.springframework.org/schema/data/jpa/spring-jpa-1.0.xsd
-        http://lenox.com/beyondj/profile
-        http://lenox.com/beyondj/profile/profile.xsd">
+        http://www.springframework.org/schema/data/jpa/spring-jpa-1.0.xsd">
 
 
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="locations">
         <property name="locations">
@@ -21,14 +18,13 @@
         </property>
         </property>
     </bean>
     </bean>
 
 
-    <bean id="derbyUtil" class="com.lenox.util.DerbyUtil">
-        <constructor-arg index="0" value="${system.jdbc.database.platform:DERBY}"/>
-        <constructor-arg index="1" value="${system.derby.database.test.path:jdbc:derby://localhost:1527/beyondj;create=false;user=beyondj_user;password=_beyondj_user_}"/>
-    </bean>
-
-    <conditional:importIf test="${system.jdbc.database.platform=='DERBY'}" src="props/core-config.properties"
-                          resource="config/spring/core-derby.xml" />
-
+    <!-- <bean id="derbyUtil" class="com.lenox.util.DerbyUtil">
+         <constructor-arg index="0" value="${system.jdbc.database.platform:DERBY}"/>
+         <constructor-arg index="1" value="${system.derby.database.test.path:jdbc:derby://localhost:1527/beyondj;create=false;user=beyondj_user;password=_beyondj_user_}"/>
+     </bean>
+     <conditional:importIf test="${system.jdbc.database.platform=='DERBY'}" src="props/core-config.properties"
+                           resource="config/spring/core-derby.xml" />
+ -->
 
 
     <jpa:repositories base-package="com.lenox.repository"></jpa:repositories>
     <jpa:repositories base-package="com.lenox.repository"></jpa:repositories>
 
 
@@ -63,8 +59,8 @@
         <property name="password" value="${system.jdbc.password}"/>
         <property name="password" value="${system.jdbc.password}"/>
     </bean>
     </bean>
 
 
-   <!-- <bean id="systemDataSet" class="com.lenox.dataset.SystemDataSet"/>
--->
+    <!-- <bean id="systemDataSet" class="com.lenox.dataset.SystemDataSet"/>
+ -->
     <bean id="roleNameParser" class="com.lenox.security.RoleNameParser">
     <bean id="roleNameParser" class="com.lenox.security.RoleNameParser">
         <constructor-arg index="0" value="config/roles.xml"/>
         <constructor-arg index="0" value="config/roles.xml"/>
     </bean>
     </bean>
@@ -79,7 +75,7 @@
         <constructor-arg index="2" ref="roleNameParser"/>
         <constructor-arg index="2" ref="roleNameParser"/>
     </bean>
     </bean>
 
 
-    <bean id ="beyondJCoreSecurityManager" class="com.lenox.security.BeyondJCoreSecurityManager">
+    <bean id="beyondJCoreSecurityManager" class="com.lenox.security.BeyondJCoreSecurityManager">
         <property name="elementParser" ref="protectedElementParser"/>
         <property name="elementParser" ref="protectedElementParser"/>
         <property name="featureNameParser" ref="featureNameParser"/>
         <property name="featureNameParser" ref="featureNameParser"/>
     </bean>
     </bean>

+ 13 - 11
frameworks/Java/beyondj/beyondj-launcher/src/main/resources/props/core-config.properties

@@ -50,22 +50,22 @@ libsigar-sparc-solaris.so,libsigar-x86-linux.so
 system.platform.config=JPA
 system.platform.config=JPA
 
 
 #MYSQL
 #MYSQL
-system.jdbc.url=jdbc:mysql://localhost:3306/hello_world
-system.jdbc.driver=com.mysql.jdbc.Driver
-system.jdbc.dialect=org.hibernate.dialect.MySQLDialect
-system.jdbc.database.platform=MYSQL
+#system.jdbc.url=jdbc:mysql://localhost:3306/hello_world
+#system.jdbc.driver=com.mysql.jdbc.Driver
+#system.jdbc.dialect=org.hibernate.dialect.MySQLDialect
+#system.jdbc.database.platform=MYSQL
 
 
 #DERBY
 #DERBY
-#system.derby.database.path=/tmp/database/hello_world
-#system.jdbc.url=jdbc:derby:beyondj;create=true
-#system.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#system.jdbc.dialect=org.hibernate.dialect.DerbyTenSevenDialect
-#system.jdbc.database.platform=DERBY
+system.derby.database.path=beyondj
+system.jdbc.url=jdbc:derby:beyondj;create=true
+system.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
+system.jdbc.dialect=org.hibernate.dialect.DerbyTenSevenDialect
+system.jdbc.database.platform=DERBY
 #derby.server.port=1527
 #derby.server.port=1527
 #derby.server.name=localhost
 #derby.server.name=localhost
 
 
 #DO NOt COMMENT THE LINE OUT EVEN IF DERBY IS NOT BEING USED
 #DO NOt COMMENT THE LINE OUT EVEN IF DERBY IS NOT BEING USED
-system.derby.database.test.path:jdbc:derby://localhost:1527/hello_world;create=false;user=benchmarkdbuser;password=benchmarkdbpass
+#system.derby.database.test.path:jdbc:derby://localhost:1527/hello_world;create=false;user=benchmarkdbuser;password=benchmarkdbpass
 
 
 system.jdbc.username=benchmarkdbuser
 system.jdbc.username=benchmarkdbuser
 system.jdbc.password=benchmarkdbpass
 system.jdbc.password=benchmarkdbpass
@@ -98,6 +98,8 @@ welcome = \
  - \u001B[36mApache Camel\u001B[0m     - Version camel.version\n\
  - \u001B[36mApache Camel\u001B[0m     - Version camel.version\n\
  - \u001B[36mHazelcast\u001B[0m        - Version hazelcast.version\n\
  - \u001B[36mHazelcast\u001B[0m        - Version hazelcast.version\n\
  - \u001B[36mAkka\u001B[0m             - Version akka.version\n\
  - \u001B[36mAkka\u001B[0m             - Version akka.version\n\
+\n\
+  \n\http://127.0.0.1:7070?__c=beyondj-service
 \n\
 \n\
 Press '\u001B[1m<CNTRL-C>\u001B[0m'to exit\n\
 Press '\u001B[1m<CNTRL-C>\u001B[0m'to exit\n\
 
 
@@ -107,6 +109,6 @@ springVersion=4.1.2.RELEASE
 hazelcastVersion=3.5.2
 hazelcastVersion=3.5.2
 showBanding=TRUE
 showBanding=TRUE
 
 
-
+system.persist.deployments.enabled=FALSE
 system.metrics.collection.cron=0+0/1+*+*+*+?
 system.metrics.collection.cron=0+0/1+*+*+*+?
 system.metrics.provision.url=http://localhost:7777/servlets/metrics
 system.metrics.provision.url=http://localhost:7777/servlets/metrics

+ 2 - 2
frameworks/Java/beyondj/beyondj-service/pom.xml

@@ -182,10 +182,10 @@
             </plugin>
             </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
-    <repositories>
+<!--    <repositories>
         <repository>
         <repository>
             <id>beyondj.com</id>
             <id>beyondj.com</id>
             <url>http://beyondj.com/maven2/</url>
             <url>http://beyondj.com/maven2/</url>
         </repository>
         </repository>
-    </repositories>
+    </repositories>-->
 </project>
 </project>

+ 2 - 2
frameworks/Java/beyondj/pom.xml

@@ -62,12 +62,12 @@
         <module>beyondj-data-loader</module>
         <module>beyondj-data-loader</module>
     </modules>
     </modules>
 
 
-    <repositories>
+<!--    <repositories>
         <repository>
         <repository>
             <id>beyondj.com</id>
             <id>beyondj.com</id>
             <url>http://beyondj.com/maven2/</url>
             <url>http://beyondj.com/maven2/</url>
         </repository>
         </repository>
-    </repositories>
+    </repositories>-->
 
 
     <build>
     <build>
         <plugins>
         <plugins>