[jboss-svn-commits] JBoss PortletSwap SVN: r159 - in portlets/src/framework/JSFRIPortlet: src/main/java/org/jboss/portal/example/dao and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 13 10:37:45 EST 2007
Author: wesleyhales
Date: 2007-11-13 10:37:45 -0500 (Tue, 13 Nov 2007)
New Revision: 159
Added:
portlets/src/framework/JSFRIPortlet/src/main/webapp/WEB-INF/classes/META-INF/images/2_6_DR_ss1.gif
Removed:
portlets/src/framework/JSFRIPortlet/src/main/webapp/WEB-INF/classes/META-INF/images/DC_Advertising.jpg
portlets/src/framework/JSFRIPortlet/src/main/webapp/WEB-INF/lib/jsf-facelets.jar
Modified:
portlets/src/framework/JSFRIPortlet/pom.xml
portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/dao/DataFilterSliderDaoImpl.java
portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/DemoInventoryList.java
portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/component/deck/jsf/component/UIShowOne.java
portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/component/deck/jsf/render/html/basic/HtmlShowOneDeckRenderer.java
portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/component/deck/taglib/ProShowOneDeckTag.java
portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/listener/DemoListener.java
portlets/src/framework/JSFRIPortlet/src/main/webapp/index.xhtml
portlets/src/framework/JSFRIPortlet/src/main/webapp/phase/listener.xhtml
Log:
cleanup
Modified: portlets/src/framework/JSFRIPortlet/pom.xml
===================================================================
--- portlets/src/framework/JSFRIPortlet/pom.xml 2007-11-13 15:36:45 UTC (rev 158)
+++ portlets/src/framework/JSFRIPortlet/pom.xml 2007-11-13 15:37:45 UTC (rev 159)
@@ -138,7 +138,6 @@
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
- <scope>provided</scope>
</dependency>
<!--Trinidad Needs to be added to seam repo-->
Modified: portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/dao/DataFilterSliderDaoImpl.java
===================================================================
--- portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/dao/DataFilterSliderDaoImpl.java 2007-11-13 15:36:45 UTC (rev 158)
+++ portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/dao/DataFilterSliderDaoImpl.java 2007-11-13 15:37:45 UTC (rev 159)
@@ -76,7 +76,7 @@
}
}catch(Exception e){
- System.out.println("!!!!!!loadAllCars Error: " + e.getMessage());
+
e.printStackTrace();
}
@@ -99,8 +99,8 @@
int arrayCount = rand(5,20);
DemoInventoryItem[] demoInventoryItemArrays = new DemoInventoryItem[arrayCount];
- System.out.println("******demoInventoryItemArrays: " + demoInventoryItemArrays.length);
+
for (int j = 0; j < demoInventoryItemArrays.length; j++){
DemoInventoryItem ii = new DemoInventoryItem();
@@ -126,7 +126,7 @@
iiList = new ArrayList(Arrays.asList(demoInventoryItemArrays));
}catch(Exception e){
- System.out.println("!!!!!!createCategory Error: " + e.getMessage());
+
e.printStackTrace();
}
return iiList;
Modified: portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/DemoInventoryList.java
===================================================================
--- portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/DemoInventoryList.java 2007-11-13 15:36:45 UTC (rev 158)
+++ portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/DemoInventoryList.java 2007-11-13 15:37:45 UTC (rev 159)
@@ -117,7 +117,7 @@
public List getCarMakeIndex() {
- System.out.println("---------------------------------getCarMakeIndex()");
+
return carMakeIndex;
}
@@ -147,7 +147,7 @@
}
protected void loadCarMakeIndex() {
- System.out.println("---------------------------------loadCarMakeIndex()");
+
carMakeIndex = dataFilterSliderDao.getAllCarMakes();
}
Modified: portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/component/deck/jsf/component/UIShowOne.java
===================================================================
--- portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/component/deck/jsf/component/UIShowOne.java 2007-11-13 15:36:45 UTC (rev 158)
+++ portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/component/deck/jsf/component/UIShowOne.java 2007-11-13 15:37:45 UTC (rev 159)
@@ -143,7 +143,7 @@
if (!isRendered())
return;
- System.out.println("------------------------processDecodes");
+
String showItemId = getShowItemId();
if (showItemId != null && getChildCount() > 0)
{
Modified: portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/component/deck/jsf/render/html/basic/HtmlShowOneDeckRenderer.java
===================================================================
--- portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/component/deck/jsf/render/html/basic/HtmlShowOneDeckRenderer.java 2007-11-13 15:36:45 UTC (rev 158)
+++ portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/component/deck/jsf/render/html/basic/HtmlShowOneDeckRenderer.java 2007-11-13 15:37:45 UTC (rev 159)
@@ -54,7 +54,7 @@
{
// first write out resources
super.encodeBegin(context, component);
- System.out.println("------------------------encodeBegin");
+
ResponseWriter out = context.getResponseWriter();
out.startElement("div", component);
Map attrs = component.getAttributes();
@@ -207,7 +207,7 @@
FacesContext context,
UIComponent component)
{
- System.out.println("------------------------decode");
+
ExternalContext external = context.getExternalContext();
Map requestParams = external.getRequestParameterMap();
String clientId = component.getClientId(context);
Modified: portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/component/deck/taglib/ProShowOneDeckTag.java
===================================================================
--- portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/component/deck/taglib/ProShowOneDeckTag.java 2007-11-13 15:36:45 UTC (rev 158)
+++ portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/component/deck/taglib/ProShowOneDeckTag.java 2007-11-13 15:37:45 UTC (rev 159)
@@ -52,7 +52,7 @@
public void setShowListener(
String showListener)
{
- System.out.println("-----------------------------3");
+
_showListener = showListener;
}
@@ -105,7 +105,7 @@
public void release()
{
_showItemId = null;
- System.out.println("-----------------------------4");
+
_showListener = null;
_styleClass = null;
_itemStyleClass = null;
@@ -125,14 +125,14 @@
// Behavioral properties
setStringProperty(component, "showItemId", _showItemId);
- System.out.println("-----------------------------1");
+
// Behavioral listeners
if (_showListener != null)
{
UIShowOne showOne = (UIShowOne) component;
MethodBinding showMethod = createMethodBinding(_showListener,
ShowAdapter.SIGNATURE);
- System.out.println("----------------------------2");
+
showOne.addShowListener(new ShowAdapter(showMethod));
}
Modified: portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/listener/DemoListener.java
===================================================================
--- portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/listener/DemoListener.java 2007-11-13 15:36:45 UTC (rev 158)
+++ portlets/src/framework/JSFRIPortlet/src/main/java/org/jboss/portal/example/web/listener/DemoListener.java 2007-11-13 15:37:45 UTC (rev 159)
@@ -29,8 +29,7 @@
public void afterPhase(PhaseEvent event) {
FacesContext facesContext = event.getFacesContext();
String viewRootId = facesContext.getViewRoot().getViewId();
- System.out.println("--------------------------------viewRootId.indexOf(RESOURCE_LOADER_VIEW_ID) != -1 " + (viewRootId.indexOf(RESOURCE_LOADER_VIEW_ID) != -1));
- if (viewRootId.indexOf(RESOURCE_LOADER_VIEW_ID) != -1) {
+ if (viewRootId.indexOf(RESOURCE_LOADER_VIEW_ID) != -1) {
serveResource(facesContext);
}
}
@@ -52,7 +51,7 @@
try {
String resourcePath = RESOURCE_FOLDER + "/" + resourceName;
- System.out.println("--------------------------------resourcePath" + resourcePath);
+
InputStream inputStream = DemoListener.class.getResourceAsStream(resourcePath);
URL url = DemoListener.class.getResource(resourcePath);
if (url == null) {
@@ -90,7 +89,7 @@
public static String getResourceName(Map requestMap) {
String resourceName = (String) requestMap.get("name");
- System.out.println("--------------------------------resourceName" + resourceName);
+
return resourceName;
}
Copied: portlets/src/framework/JSFRIPortlet/src/main/webapp/WEB-INF/classes/META-INF/images/2_6_DR_ss1.gif (from rev 156, portlets/src/framework/JSFRIPortlet/src/main/webapp/images/2_6_DR_ss1.gif)
===================================================================
(Binary files differ)
Deleted: portlets/src/framework/JSFRIPortlet/src/main/webapp/WEB-INF/classes/META-INF/images/DC_Advertising.jpg
===================================================================
(Binary files differ)
Deleted: portlets/src/framework/JSFRIPortlet/src/main/webapp/WEB-INF/lib/jsf-facelets.jar
===================================================================
(Binary files differ)
Modified: portlets/src/framework/JSFRIPortlet/src/main/webapp/index.xhtml
===================================================================
--- portlets/src/framework/JSFRIPortlet/src/main/webapp/index.xhtml 2007-11-13 15:36:45 UTC (rev 158)
+++ portlets/src/framework/JSFRIPortlet/src/main/webapp/index.xhtml 2007-11-13 15:37:45 UTC (rev 159)
@@ -3,11 +3,10 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jstl/core"
- xmlns:a4j="http://richfaces.org/a4j">
+ xmlns:c="http://java.sun.com/jstl/core">
- <ui:define name="title">JSF Training Sandbox</ui:define>
+ <ui:define name="title">JSF RI Demo</ui:define>
<ui:define name="body">
Modified: portlets/src/framework/JSFRIPortlet/src/main/webapp/phase/listener.xhtml
===================================================================
--- portlets/src/framework/JSFRIPortlet/src/main/webapp/phase/listener.xhtml 2007-11-13 15:36:45 UTC (rev 158)
+++ portlets/src/framework/JSFRIPortlet/src/main/webapp/phase/listener.xhtml 2007-11-13 15:37:45 UTC (rev 159)
@@ -20,7 +20,6 @@
<img src=".resource.jsf?name=images/2_6_DR_ss1.gif" width="400px"/>
<img src="/JSFRIDemo/.resource.jsf?name=images/2_6_DR_ss1.gif" width="400px"/>
<img src="/JSFRIDemo/.resource.jsf?name=2_6_DR_ss1.gif" width="400px"/>
-
</ui:define>
</ui:composition>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list