You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/02/11 23:15:31 UTC
svn commit: r620639 - in /myfaces/orchestra/trunk/examples/src/main:
java/org/apache/myfaces/examples/filter/RequestEncodingFilter.java
webapp/WEB-INF/applicationContext.xml
Author: skitching
Date: Mon Feb 11 14:15:29 2008
New Revision: 620639
URL: http://svn.apache.org/viewvc?rev=620639&view=rev
Log:
Whitespace tidyups, remove old aop:scoped-proxy declarations, etc.
Modified:
myfaces/orchestra/trunk/examples/src/main/java/org/apache/myfaces/examples/filter/RequestEncodingFilter.java
myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml
Modified: myfaces/orchestra/trunk/examples/src/main/java/org/apache/myfaces/examples/filter/RequestEncodingFilter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/java/org/apache/myfaces/examples/filter/RequestEncodingFilter.java?rev=620639&r1=620638&r2=620639&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/java/org/apache/myfaces/examples/filter/RequestEncodingFilter.java (original)
+++ myfaces/orchestra/trunk/examples/src/main/java/org/apache/myfaces/examples/filter/RequestEncodingFilter.java Mon Feb 11 14:15:29 2008
@@ -30,6 +30,7 @@
{
public void init(FilterConfig filterConfig) throws ServletException
{
+ // do nothing
}
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException
@@ -41,5 +42,6 @@
public void destroy()
{
+ // do nothing
}
}
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml?rev=620639&r1=620638&r2=620639&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml Mon Feb 11 14:15:29 2008
@@ -169,29 +169,11 @@
-->
<!-- dao -->
- <bean
- name="componentDao"
- class="org.apache.myfaces.examples.configurator.model.dao.ComponentDAO">
- </bean>
- <bean
- name="orderHeadDao"
- class="org.apache.myfaces.examples.configurator.model.dao.OrderHeadDAO">
- </bean>
- <bean
- name="pieceDao"
- class="org.apache.myfaces.examples.configurator.model.dao.PieceDAO">
- </bean>
- <bean
- name="customerDao"
- class="org.apache.myfaces.examples.configurator.model.dao.CustomerDAO">
- </bean>
- <bean
- name="initialization"
- class="org.apache.myfaces.examples.configurator.model.Initialization">
- </bean>
-
-
- <!-- the beans -->
+ <bean name="componentDao" class="org.apache.myfaces.examples.configurator.model.dao.ComponentDAO"/>
+ <bean name="orderHeadDao" class="org.apache.myfaces.examples.configurator.model.dao.OrderHeadDAO"/>
+ <bean name="pieceDao" class="org.apache.myfaces.examples.configurator.model.dao.PieceDAO"/>
+ <bean name="customerDao" class="org.apache.myfaces.examples.configurator.model.dao.CustomerDAO"/>
+ <bean name="initialization" class="org.apache.myfaces.examples.configurator.model.Initialization"/>
<!-- reservationBook example -->
<bean name="reservationBookView"
@@ -203,242 +185,129 @@
scope="conversation.access"/>
<!-- PC Configurator Example -->
- <bean
- name="configuratorData"
+ <bean name="configuratorData"
class="org.apache.myfaces.examples.configurator.backings.ConfiguratorData"
scope="conversation.manual"
- autowire="byName">
-
- <aop:scoped-proxy/>
- </bean>
+ autowire="byName"/>
- <bean
- name="configuratorCustomer"
+ <bean name="configuratorCustomer"
class="org.apache.myfaces.examples.configurator.backings.Customer"
scope="conversation.manual"
- autowire="byName">
+ autowire="byName"/>
- <aop:scoped-proxy/>
- </bean>
-
- <!-- just a simple view controller -->
- <bean
- name="configuratorCheckout"
+ <bean name="configuratorCheckout"
class="org.apache.myfaces.examples.configurator.backings.Checkout"
- scope="request">
-
- </bean>
+ scope="request"/>
<!-- ballot example -->
- <bean
- name="topicDao"
- class="org.apache.myfaces.examples.ballot.dao.TopicDao">
- </bean>
- <bean
- name="itemDao"
- class="org.apache.myfaces.examples.ballot.dao.ItemDao">
- </bean>
- <bean
- name="voterDao"
- class="org.apache.myfaces.examples.ballot.dao.VoterDao">
- </bean>
- <bean
- name="voteDao"
- class="org.apache.myfaces.examples.ballot.dao.VoteDao">
- </bean>
+ <bean name="topicDao" class="org.apache.myfaces.examples.ballot.dao.TopicDao"/>
+ <bean name="itemDao" class="org.apache.myfaces.examples.ballot.dao.ItemDao"/>
+ <bean name="voterDao" class="org.apache.myfaces.examples.ballot.dao.VoterDao"/>
+ <bean name="voteDao" class="org.apache.myfaces.examples.ballot.dao.VoteDao"/>
- <bean
- name="ballotState"
+ <bean name="ballotState"
class="org.apache.myfaces.examples.ballot.lib.BallotState"
- scope="session">
+ scope="session"/>
- </bean>
-
- <bean
- name="ballotHall"
+ <bean name="ballotHall"
class="org.apache.myfaces.examples.ballot.backings.BallotHall"
scope="request"
- autowire="byName">
+ autowire="byName"/>
- </bean>
-
- <bean
- name="ballotTopicVotes"
+ <bean name="ballotTopicVotes"
class="org.apache.myfaces.examples.ballot.backings.BallotTopicVotes"
scope="conversation.access"
- autowire="byName">
-
- </bean>
+ autowire="byName"/>
- <bean
- name="ballotTopic"
+ <bean name="ballotTopic"
class="org.apache.myfaces.examples.ballot.backings.BallotTopic"
scope="conversation.access"
- autowire="byName">
-
- <aop:scoped-proxy/>
-
- </bean>
+ autowire="byName"/>
- <bean
- name="ballotVoteTopicCmp"
+ <bean name="ballotVoteTopicCmp"
class="org.apache.myfaces.examples.ballot.backings.BallotVoteTopicCmp"
scope="request">
-
<aop:scoped-proxy/>
-
</bean>
- <bean
- name="ballotVoteTopic"
+ <bean name="ballotVoteTopic"
class="org.apache.myfaces.examples.ballot.backings.BallotVoteTopic"
scope="conversation.access"
- autowire="byName">
-
- <aop:scoped-proxy/>
-
- </bean>
+ autowire="byName"/>
- <bean
- name="ballotVoter"
+ <bean name="ballotVoter"
class="org.apache.myfaces.examples.ballot.backings.BallotVoter"
scope="conversation.manual"
- autowire="byName">
-
- <aop:scoped-proxy/>
-
- </bean>
+ autowire="byName"/>
- <bean
- name="bean1"
+ <bean name="bean1"
class="org.apache.myfaces.examples.multibean.Bean1"
scope="conversation.manual"
- orchestra:conversationName="multibean">
+ orchestra:conversationName="multibean"/>
- <aop:scoped-proxy/>
-
- </bean>
-
- <bean
- name="bean2"
+ <bean name="bean2"
class="org.apache.myfaces.examples.multibean.Bean2"
scope="conversation.manual"
- orchestra:conversationName="multibean">
-
- <aop:scoped-proxy/>
-
- </bean>
+ orchestra:conversationName="multibean"/>
- <bean
- name="multiViewController"
+ <bean name="multiViewController"
class="org.apache.myfaces.examples.annotations.MultiViewController"
- scope="conversation.manual">
-
- <aop:scoped-proxy/>
-
- </bean>
+ scope="conversation.manual"/>
<!-- mops - MyFaces Orchestra PetStore -->
- <bean
- name="productDao"
+ <bean name="productDao"
class="org.apache.myfaces.examples.mops.dao.ProductDao">
-
<property name="entityManagerFactory" ref="entityManagerFactory"/>
-
</bean>
- <bean
- name="productPriceDao"
- class="org.apache.myfaces.examples.mops.dao.ProductPriceDao" />
-
- <bean
- name="customerGroupDao"
- class="org.apache.myfaces.examples.mops.dao.CustomerGroupDao" />
-
- <bean
- name="shopCustomerDao"
- class="org.apache.myfaces.examples.mops.dao.ShopCustomerDao" />
-
- <bean
- name="customerGroupSuggest"
- class="org.apache.myfaces.examples.mops.dao.CustomerGroupSuggest"
+ <bean name="productPriceDao" class="org.apache.myfaces.examples.mops.dao.ProductPriceDao" />
+ <bean name="customerGroupDao" class="org.apache.myfaces.examples.mops.dao.CustomerGroupDao" />
+ <bean name="shopCustomerDao" class="org.apache.myfaces.examples.mops.dao.ShopCustomerDao" />
+ <bean name="customerGroupSuggest"
+ class="org.apache.myfaces.examples.mops.dao.CustomerGroupSuggest"
scope="conversation.viewController"
- autowire="byName">
- <aop:scoped-proxy/>
- </bean>
+ autowire="byName"/>
- <bean
- name="customerGroupPkConverter"
+ <bean name="customerGroupPkConverter"
class="org.apache.myfaces.examples.mops.lib.CustomerGroupPkConverter"
scope="conversation.viewController"
- autowire="byName">
+ autowire="byName"/>
- <aop:scoped-proxy/>
- </bean>
-
- <bean
- name="petstoreData"
+ <bean name="petstoreData"
class="org.apache.myfaces.examples.mops.backings.PetstoreData"
scope="conversation.manual"
orchestra:conversationName="petstoreConversation"
- autowire="byName">
-
- <aop:scoped-proxy/>
- </bean>
+ autowire="byName"/>
- <bean
- name="mopsSecurity"
+ <bean name="mopsSecurity"
class="org.apache.myfaces.examples.mops.backings.Security"
scope="conversation.manual"
- orchestra:conversationName="petstoreConversation">
-
- <aop:scoped-proxy/>
- </bean>
+ orchestra:conversationName="petstoreConversation"/>
- <bean
- name="mopsEditProduct"
+ <bean name="mopsEditProduct"
class="org.apache.myfaces.examples.mops.backings.EditProduct"
scope="conversation.access"
- autowire="byName">
+ autowire="byName"/>
- <aop:scoped-proxy/>
- </bean>
-
- <bean
- name="mopsProductDetail"
+ <bean name="mopsProductDetail"
class="org.apache.myfaces.examples.mops.backings.ProductDetail"
scope="conversation.access"
- autowire="byName">
-
- <aop:scoped-proxy/>
- </bean>
+ autowire="byName"/>
- <bean
- name="mopsEditCustomerGroup"
+ <bean name="mopsEditCustomerGroup"
class="org.apache.myfaces.examples.mops.backings.EditCustomerGroup"
scope="conversation.access"
- autowire="byName">
+ autowire="byName"/>
- <aop:scoped-proxy/>
- </bean>
-
- <bean
- name="mopsSearchProduct"
+ <bean name="mopsSearchProduct"
class="org.apache.myfaces.examples.mops.backings.SearchProduct"
scope="conversation.access"
- autowire="byName">
-
- <aop:scoped-proxy/>
- </bean>
+ autowire="byName"/>
- <bean
- name="mopsCustomerLogin"
+ <bean name="mopsCustomerLogin"
class="org.apache.myfaces.examples.mops.backings.CustomerLogin"
scope="conversation.access"
- autowire="byName">
-
- <aop:scoped-proxy/>
- </bean>
+ autowire="byName"/>
</beans>