You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/03/07 20:57:31 UTC

svn commit: r515720 - in /myfaces/tobago/trunk/example/addressbook: pom.xml src/main/webapp/WEB-INF/applicationContext.xml src/main/webapp/WEB-INF/tobago-config.xml

Author: bommel
Date: Wed Mar  7 11:57:30 2007
New Revision: 515720

URL: http://svn.apache.org/viewvc?view=rev&rev=515720
Log:
cleanup examples

Modified:
    myfaces/tobago/trunk/example/addressbook/pom.xml
    myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/applicationContext.xml
    myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tobago-config.xml

Modified: myfaces/tobago/trunk/example/addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/pom.xml?view=diff&rev=515720&r1=515719&r2=515720
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/pom.xml (original)
+++ myfaces/tobago/trunk/example/addressbook/pom.xml Wed Mar  7 11:57:30 2007
@@ -113,16 +113,11 @@
       <artifactId>openjpa-xmlstore</artifactId>
       <version>0.9.6-incubating</version>
     </dependency>
-    <!--<dependency>
-      <groupId>javax.persistence</groupId>
-      <artifactId>toplink-essentials</artifactId>
-      <version>1.0</version>
-    </dependency>-->
-    <!--<dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-entitymanager</artifactId>
-      <version>3.2.1.ga</version>
-    </dependency>-->
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-charlotteville</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-theme-richmond</artifactId>

Modified: myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/applicationContext.xml?view=diff&rev=515720&r1=515719&r2=515720
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/applicationContext.xml Wed Mar  7 11:57:30 2007
@@ -29,36 +29,8 @@
   
   <bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor"/>
 
-  <!--<bean id="entityManagerFactory"
-          class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
-    <property name="jpaProperties">
-      <props>
-        <prop key="toplink.logging.level">FINE</prop>
-        <prop key="toplink.jdbc.driver">org.apache.derby.jdbc.EmbeddedDriver</prop>
-        <prop key="toplink.jdbc.url">jdbc:derby:target/addressDB;create=true</prop>
-        <prop key="toplink.target-database">oracle.toplink.essentials.platform.database.DerbyPlatform</prop>
-        <prop key="toplink.ddl-generation">create-tables</prop>
-      </props>
-    </property>
-    <property name="persistenceUnitName" value="addressBook"/>
-  </bean>-->
-
   <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
     <property name="dataSource" ref="dataSource"/>
-    <!--<property name="jpaVendorAdapter">
-      <bean class="org.springframework.orm.jpa.vendor.TopLinkJpaVendorAdapter">
-        <property name="showSql" value="true"/>
-        <property name="generateDdl" value="true"/>
-        <property name="databasePlatform" value="oracle.toplink.essentials.platform.database.DerbyPlatform"/>
-      </bean>
-    </property>-->
-    <!--<property name="jpaVendorAdapter">
-      <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
-        <property name="databasePlatform" value="org.hibernate.dialect.DerbyDialect"/>
-        <property name="showSql" value="true"/>
-        <property name="generateDdl" value="true"/>
-      </bean>
-    </property>-->
     <property name="jpaVendorAdapter">
       <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
         <property name="showSql" value="true"/>
@@ -67,8 +39,6 @@
     </property>
     <property name="persistenceUnitName" value="addressBook"/>
     <property name="loadTimeWeaver">
-      <!--<bean class="org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver"/>-->
-      <!--<bean class="org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver"/>-->
       <bean class="org.springframework.instrument.classloading.SimpleLoadTimeWeaver"/>
     </property>
   </bean>

Modified: myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tobago-config.xml?view=diff&rev=515720&r1=515719&r2=515720
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tobago-config.xml Wed Mar  7 11:57:30 2007
@@ -26,6 +26,7 @@
     <default-theme>speyside</default-theme>
     <supported-theme>scarborough</supported-theme>
     <supported-theme>richmond</supported-theme>
+    <supported-theme>charlotteville</supported-theme>
   </theme-config>
 
   <resource-dir>tobago-resource</resource-dir>