You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2010/06/13 21:36:36 UTC
svn commit: r954289 - in /openwebbeans/trunk/samples:
conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/
ejb-sample/src/main/java/org/apache/webbeans/sample/decorator/
ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/ ej...
Author: struberg
Date: Sun Jun 13 19:36:35 2010
New Revision: 954289
URL: http://svn.apache.org/viewvc?rev=954289&view=rev
Log:
OWB-275 code cleanup
Modified:
openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Item.java
openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java
openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/decorator/EchoDecorator.java
openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/LogInterceptor.java
openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/LogInterceptorBinding.java
openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
openwebbeans/trunk/samples/ejb-telephone/src/main/java/org/apache/webbeans/telephone/util/FacesMessageUtil.java
openwebbeans/trunk/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/ConversationBean.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/security/JSFSecurityPhaseListener.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/session/SessionTracker.java
openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java
openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java
openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java
openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
Modified: openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Item.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Item.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Item.java (original)
+++ openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Item.java Sun Jun 13 19:36:35 2010
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java (original)
+++ openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java Sun Jun 13 19:36:35 2010
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java (original)
+++ openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java Sun Jun 13 19:36:35 2010
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/decorator/EchoDecorator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/decorator/EchoDecorator.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/decorator/EchoDecorator.java (original)
+++ openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/decorator/EchoDecorator.java Sun Jun 13 19:36:35 2010
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/LogInterceptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/LogInterceptor.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/LogInterceptor.java (original)
+++ openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/LogInterceptor.java Sun Jun 13 19:36:35 2010
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/LogInterceptorBinding.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/LogInterceptorBinding.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/LogInterceptorBinding.java (original)
+++ openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/LogInterceptorBinding.java Sun Jun 13 19:36:35 2010
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java (original)
+++ openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java Sun Jun 13 19:36:35 2010
@@ -28,15 +28,14 @@ import javax.faces.context.FacesContext;
@Dependent
public class FacesMessageUtil
{
+ public FacesMessageUtil()
+ {
- public FacesMessageUtil()
- {
-
- }
-
- public void addMessage(Severity severity,String summary, String detail)
- {
- FacesMessage message = new FacesMessage(severity,summary,detail);
- FacesContext.getCurrentInstance().addMessage(null, message);
- }
+ }
+
+ public void addMessage(Severity severity,String summary, String detail)
+ {
+ FacesMessage message = new FacesMessage(severity,summary,detail);
+ FacesContext.getCurrentInstance().addMessage(null, message);
+ }
}
Modified: openwebbeans/trunk/samples/ejb-telephone/src/main/java/org/apache/webbeans/telephone/util/FacesMessageUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-telephone/src/main/java/org/apache/webbeans/telephone/util/FacesMessageUtil.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-telephone/src/main/java/org/apache/webbeans/telephone/util/FacesMessageUtil.java (original)
+++ openwebbeans/trunk/samples/ejb-telephone/src/main/java/org/apache/webbeans/telephone/util/FacesMessageUtil.java Sun Jun 13 19:36:35 2010
@@ -29,14 +29,14 @@ import javax.faces.context.FacesContext;
public class FacesMessageUtil
{
- public FacesMessageUtil()
- {
-
- }
-
- public void addMessage(Severity severity,String summary, String detail)
- {
- FacesMessage message = new FacesMessage(severity,summary,detail);
- FacesContext.getCurrentInstance().addMessage(null, message);
- }
+ public FacesMessageUtil()
+ {
+
+ }
+
+ public void addMessage(Severity severity,String summary, String detail)
+ {
+ FacesMessage message = new FacesMessage(severity,summary,detail);
+ FacesContext.getCurrentInstance().addMessage(null, message);
+ }
}
Modified: openwebbeans/trunk/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/ConversationBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/ConversationBean.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/ConversationBean.java (original)
+++ openwebbeans/trunk/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/ConversationBean.java Sun Jun 13 19:36:35 2010
@@ -113,7 +113,7 @@ public class ConversationBean
public String conversationLive()
{
- return null;
+ return null;
}
Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java (original)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java Sun Jun 13 19:36:35 2010
@@ -85,7 +85,9 @@ public class UserReservationBean impleme
{
date = new SimpleDateFormat("dd/MM/yyyy").parse(getReservationDate());
- }catch(Exception e){
+ }
+ catch(Exception e)
+ {
JSFUtility.addErrorMessage("Please give a date with dd/MM/yyyy", "");
return null;
@@ -145,8 +147,8 @@ public class UserReservationBean impleme
for(Integer i : this.itemSelected)
{
- SelectItem item = null;
- if((item = contains(i)) != null)
+ SelectItem item = contains(i);
+ if(item != null)
{
this.reservations.remove(item);
Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java (original)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java Sun Jun 13 19:36:35 2010
@@ -63,8 +63,8 @@ public class LoginController implements
}
Query query = entityManager.createQuery("select p from User p where " +
- "p.userName=:userName and " +
- "p.password=:password");
+ "p.userName=:userName and " +
+ "p.password=:password");
query.setParameter("userName", userName);
query.setParameter("password", password);
Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java (original)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java Sun Jun 13 19:36:35 2010
@@ -52,7 +52,8 @@ public class TransactionalInterceptor
return context.proceed();
- }catch(Exception e)
+ }
+ catch(Exception e)
{
logger.error("Exception in transactional method call", e);
@@ -63,7 +64,8 @@ public class TransactionalInterceptor
throw e;
- }finally
+ }
+ finally
{
if(transaction != null && transaction.isActive())
{
Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/security/JSFSecurityPhaseListener.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/security/JSFSecurityPhaseListener.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/security/JSFSecurityPhaseListener.java (original)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/security/JSFSecurityPhaseListener.java Sun Jun 13 19:36:35 2010
@@ -47,7 +47,8 @@ public class JSFSecurityPhaseListener im
tracker = (SessionTracker)context.getApplication().evaluateExpressionGet(context, "#{sessionTracker}", SessionTracker.class);
user = tracker.getUser();
- }catch(Exception e)
+ }
+ catch(Exception e)
{
//Tracker is null
System.out.println("Context is not active");
Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/session/SessionTracker.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/session/SessionTracker.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/session/SessionTracker.java (original)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/session/SessionTracker.java Sun Jun 13 19:36:35 2010
@@ -28,7 +28,6 @@ import org.apache.webbeans.reservation.e
import javax.enterprise.context.SessionScoped;
import javax.enterprise.event.Observes;
import javax.inject.Named;
-import javax.enterprise.inject.spi.BeanManager;
@SessionScoped
@Named
@@ -40,7 +39,7 @@ public class SessionTracker implements S
/**
* When event fires, this observer method is called
- * by the {@link BeanManager} interface.
+ * by the {@link javax.enterprise.inject.spi.BeanManager} interface.
*
* @param loggedInEvent event
*/
Modified: openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java (original)
+++ openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java Sun Jun 13 19:36:35 2010
@@ -43,7 +43,8 @@ public class Boot
lifecycle = LifecycleFactory.getInstance().getLifecycle();
lifecycle.startApplication(startupObject);
- }catch(Exception e)
+ }
+ catch(Exception e)
{
throw e;
}
@@ -55,7 +56,8 @@ public class Boot
{
lifecycle.stopApplication(endObject);
- }catch(Exception e)
+ }
+ catch(Exception e)
{
throw e;
}
Modified: openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java (original)
+++ openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java Sun Jun 13 19:36:35 2010
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java (original)
+++ openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java Sun Jun 13 19:36:35 2010
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java (original)
+++ openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java Sun Jun 13 19:36:35 2010
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java (original)
+++ openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java Sun Jun 13 19:36:35 2010
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java (original)
+++ openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java Sun Jun 13 19:36:35 2010
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java?rev=954289&r1=954288&r2=954289&view=diff
==============================================================================
--- openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java (original)
+++ openwebbeans/trunk/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java Sun Jun 13 19:36:35 2010
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/