portletswap-commits February 2008

portletswap-commits@lists.jboss.org

1 participants
3 discussions

JBoss PortletSwap SVN: r229 - portlets/src/framework.

by portletswap-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-02-13 09:43:11 -0500 (Wed, 13 Feb 2008) New Revision: 229 Removed: portlets/src/framework/SeamBookingPortlet/ Log: Moved

16 years, 2 months

1
0
0 / 0

JBoss PortletSwap SVN: r228 - in portlets/src/framework/SeamBookingPortlet: ear and 5 other directories.

by portletswap-commits＠lists.jboss.org

Author: wesleyhales Date: 2008-02-05 15:13:36 -0500 (Tue, 05 Feb 2008) New Revision: 228 Added: portlets/src/framework/SeamBookingPortlet/ear/src/main/resources/application.xml portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/components.xml portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-app.xml portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/error.xhtml Modified: portlets/src/framework/SeamBookingPortlet/ear/pom.xml portlets/src/framework/SeamBookingPortlet/ejb/pom.xml portlets/src/framework/SeamBookingPortlet/pom.xml portlets/src/framework/SeamBookingPortlet/web/pom.xml portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/faces-config.xml portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-web.xml portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/web.xml portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/help.xhtml portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml Log: updated changes for booking demo Modified: portlets/src/framework/SeamBookingPortlet/ear/pom.xml =================================================================== --- portlets/src/framework/SeamBookingPortlet/ear/pom.xml 2008-02-01 13:28:54 UTC (rev 227) +++ portlets/src/framework/SeamBookingPortlet/ear/pom.xml 2008-02-05 20:13:36 UTC (rev 228) @@ -27,7 +27,7 @@ <dependency> <groupId>org.jboss.portal.example</groupId> - <artifactId>PortletWeb</artifactId> + <artifactId>seamBookingPortlet</artifactId> <version>${project.version}</version> <type>war</type> </dependency> @@ -44,17 +44,18 @@ </dependency> <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-el</artifactId> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> <exclusions> <exclusion> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </exclusion> </exclusions> - <type>jar</type> + <type>jar</type> </dependency> + <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> @@ -136,8 +137,8 @@ <webModule> <groupId>org.jboss.portal.example</groupId> - <artifactId>PortletWeb</artifactId> - <contextRoot>/SeamBookingPortletWeb-${version}</contextRoot> + <artifactId>seamBookingPortlet</artifactId> + <contextRoot>/seamBookingPortlet</contextRoot> </webModule> <ejbModule> @@ -152,9 +153,10 @@ </jarModule> <jarModule> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-el</artifactId> -  + + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + <bundleDir>lib</bundleDir> </jarModule> Added: portlets/src/framework/SeamBookingPortlet/ear/src/main/resources/application.xml =================================================================== --- portlets/src/framework/SeamBookingPortlet/ear/src/main/resources/application.xml (rev 0) +++ portlets/src/framework/SeamBookingPortlet/ear/src/main/resources/application.xml 2008-02-05 20:13:36 UTC (rev 228) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" version="1.4"> + <description>JBoss Portal Seam Booking Portlet Example EAR</description> + <display-name>SeamBookingPortlet</display-name> +  +  +  +  +  +  + <module> + <java>drools-core-4.0.0.jar</java> + </module> + <module> + <java>drools-compiler-4.0.0.jar</java> + </module> + <module> + <java>janino-2.4.3.jar</java> + </module> + <module> + <java>mvel14-1.2rc4rv908.jar</java> + </module> + <module> + <java>antlr-2.7.7.jar</java> + </module> + <module> + <java>mvel14-1.2rc4rv908.jar</java> + </module> + <module> + <java>jboss-seam-2.0.1-SNAPSHOT.jar</java> + </module><module id="EJB"><ejb>PortletEjb-1.0.jar</ejb></module><module id="Web"><web><web-uri>seamBookingPortlet-1.0.war</web-uri></web></module> + </application> \ No newline at end of file Modified: portlets/src/framework/SeamBookingPortlet/ejb/pom.xml =================================================================== --- portlets/src/framework/SeamBookingPortlet/ejb/pom.xml 2008-02-01 13:28:54 UTC (rev 227) +++ portlets/src/framework/SeamBookingPortlet/ejb/pom.xml 2008-02-05 20:13:36 UTC (rev 228) @@ -19,10 +19,66 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> - <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-core</artifactId> + </dependency> + + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-compiler</artifactId> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>janino</groupId> + <artifactId>janino</artifactId> + </dependency> + + <dependency> + <groupId>org.mvel</groupId> + <artifactId>mvel14</artifactId> + </dependency> + + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </dependency> + + <dependency> + <groupId>org.mvel</groupId> + <artifactId>mvel14</artifactId> + </dependency> + +  <dependency> @@ -60,11 +116,11 @@ <scope>provided</scope> </dependency> - <dependency> +  Modified: portlets/src/framework/SeamBookingPortlet/pom.xml =================================================================== --- portlets/src/framework/SeamBookingPortlet/pom.xml 2008-02-01 13:28:54 UTC (rev 227) +++ portlets/src/framework/SeamBookingPortlet/pom.xml 2008-02-05 20:13:36 UTC (rev 228) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>root</artifactId> - <version>2.0.0.GA</version> + <version>2.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.portal.example</groupId> Modified: portlets/src/framework/SeamBookingPortlet/web/pom.xml =================================================================== --- portlets/src/framework/SeamBookingPortlet/web/pom.xml 2008-02-01 13:28:54 UTC (rev 227) +++ portlets/src/framework/SeamBookingPortlet/web/pom.xml 2008-02-05 20:13:36 UTC (rev 228) @@ -8,7 +8,7 @@ <version>1.0</version> </parent> <groupId>org.jboss.portal.example</groupId> - <artifactId>PortletWeb</artifactId> + <artifactId>seamBookingPortlet</artifactId> <packaging>war</packaging> <version>1.0</version> <name>JBoss Portal Seam Booking Portlet Example WAR</name> @@ -17,7 +17,7 @@ <build> <defaultGoal>install</defaultGoal>  - <finalName>${artifactId}-${version}</finalName> + <finalName>seamBookingPortlet</finalName> <resources> @@ -304,28 +304,50 @@ <dependency> - <groupId>org.apache.myfaces.portlet-bridge</groupId> - <artifactId>portlet-bridge-impl</artifactId> - <version>1.0.0-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - </exclusion> - </exclusions> - </dependency> + <groupId>org.richfaces.extensions.portletbridge</groupId> + <artifactId>portletbridge-api</artifactId> + <version>3.2.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.richfaces.extensions.portletbridge</groupId> + <artifactId>portletbridge-impl</artifactId> + <version>3.2.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>org.apache.myfaces.portlet-bridge</groupId> - <artifactId>portlet-bridge-api</artifactId> - <version>1.0.0-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - </exclusion> - </exclusions> - </dependency> +  +  +  +  +  +  +  +  +  +  +  +  + + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> @@ -459,8 +481,8 @@ </dependency> <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-el</artifactId> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> <exclusions> <exclusion> <groupId>javax.el</groupId> Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/components.xml =================================================================== --- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/components.xml (rev 0) +++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/components.xml 2008-02-05 20:13:36 UTC (rev 228) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:drools="http://jboss.com/products/seam/drools" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:security="http://jboss.com/products/seam/security" + xmlns:web="http://jboss.com/products/seam/web" + xmlns:mail="http://jboss.com/products/seam/mail" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:transaction="http://jboss.com/products/seam/transaction" + xsi:schemaLocation= + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd + http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd + http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + + <core:init jndi-pattern="SeamBookingPortlet-1.0/#{ejbName}/local"/> + + <core:manager auto-create="true" conversation-timeout="120000" + concurrent-request-timeout="500" + conversation-id-parameter="cid"/> + + <persistence:managed-persistence-context name="entityManager" + auto-create="true" + persistence-unit-jndi-name="java:/seamtestappEntityManagerFactory"/> + + +  + + <security:identity authenticate-method="#{authenticator.authenticate}"/> + + +</components> Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/faces-config.xml 2008-02-01 13:28:54 UTC (rev 227) +++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/faces-config.xml 2008-02-05 20:13:36 UTC (rev 228) @@ -1,22 +1,18 @@ <?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE faces-config PUBLIC - "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" - "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> - -<faces-config> - <application> -  - <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler> - </application> - <factory> -  - </factory> - +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + + <application> + <view-handler> + org.ajax4jsf.portlet.application.PortletViewHandler + </view-handler> + </application> + <factory> + <faces-context-factory> + org.ajax4jsf.portlet.context.FacesContextFactoryImpl + </faces-context-factory> + </factory> + </faces-config> Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-app.xml =================================================================== --- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-app.xml (rev 0) +++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-app.xml 2008-02-05 20:13:36 UTC (rev 228) @@ -0,0 +1,3 @@ +<jboss-app> + <app-name>seamBookingPortletApp</app-name> +</jboss-app> \ No newline at end of file Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-web.xml 2008-02-01 13:28:54 UTC (rev 227) +++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-web.xml 2008-02-05 20:13:36 UTC (rev 228) @@ -1,8 +1,12 @@ -<jboss-web> - <class-loading java2ClassLoadingCompliance="false"> - <loader-repository> - seam.jboss.org:loader=seamtestapp - <loader-repository-config>java2ParentDelegation=false</loader-repository-config> - </loader-repository> - </class-loading> -</jboss-web> +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> + + <jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository> + seam.jboss.org:loader=seamBookingPortlet + <loader-repository-config>java2ParentDelegation=false</loader-repository-config> + </loader-repository> + </class-loading> + </jboss-web> Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml 2008-02-01 13:28:54 UTC (rev 227) +++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml 2008-02-05 20:13:36 UTC (rev 228) @@ -2,10 +2,11 @@ <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" - - no-conversation-view-id="/main.xhtml" - login-view-id="/home.xhtml"> - + no-conversation-view-id="/main.xhtml" + login-view-id="/home.xhtml"> +  <page view-id="/register.xhtml"> <action if="#{validation.failed}" @@ -13,17 +14,20 @@ <navigation> <rule if="#{register.registered}"> - <redirect view-id="/home.xhtml"/> + <render view-id="/home.xhtml"/> </rule> </navigation> </page> <page view-id="/home.xhtml"> - + <action execute="#{identity.login}" if="#{identity.loggedIn}"/> + <navigation from-action="#{identity.login}"> + <render view-id="/main.xhtml"/> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> - <redirect view-id="/main.xhtml"/> + <render view-id="/main.xhtml"/> </rule> </navigation> @@ -34,7 +38,7 @@ <navigation> <rule if="#{changePassword.changed}"> - <redirect view-id="/main.xhtml"/> + <render view-id="/main.xhtml"/> </rule> </navigation> @@ -44,49 +48,49 @@ login-required="true"> <navigation from-action="#{hotelBooking.selectHotel(hot)}"> - <redirect view-id="/hotel.xhtml"/> + <render view-id="/hotel.xhtml"/> </navigation> <navigation from-action="#{bookingList.cancel}"> - <redirect/> + <render/> </navigation> </page> - <page view-id="/hotel.xhtml" - conversation-required="true" - login-required="true"> + <page view-id="/hotel.xhtml" + conversation-required="true" + login-required="true"> <description>View hotel: #{hotel.name}</description> <navigation from-action="#{hotelBooking.bookHotel}"> - <redirect view-id="/book.xhtml"/> + <render view-id="/book.xhtml"/> </navigation> </page> - <page view-id="/book.xhtml" - conversation-required="true" - login-required="true"> + <page view-id="/book.xhtml" + conversation-required="true" + login-required="true"> <description>Book hotel: #{hotel.name}</description> <navigation from-action="#{hotelBooking.setBookingDetails}"> <rule if="#{hotelBooking.bookingValid}"> - <redirect view-id="/confirm.xhtml"/> + <render view-id="/confirm.xhtml"/> </rule> </navigation> </page> - <page view-id="/confirm.xhtml" - conversation-required="true" - login-required="true"> + <page view-id="/confirm.xhtml" + conversation-required="true" + login-required="true"> <description>Confirm booking: #{booking.description}</description> <navigation from-action="#{hotelBooking.confirm}"> - <redirect view-id="/main.xhtml"/> + <render view-id="/main.xhtml"/> </navigation> </page> @@ -94,15 +98,27 @@ <page view-id="*"> <navigation from-action="#{identity.logout}"> - <redirect view-id="/home.xhtml"/> + <render view-id="/home.xhtml"/> </navigation> <navigation from-action="#{hotelBooking.cancel}"> - <redirect view-id="/main.xhtml"/> + <render view-id="/main.xhtml"/> </navigation> </page> + <exception class="java.lang.Exception"> + <redirect view-id="/help.xhtml"> + <message severity="warn">There was an Error processing register.</message> + </redirect> + </exception> + + <exception class="javax.el.PropertyNotFoundException"> + <redirect view-id="/error.xhtml"> + <message severity="warn">There was an Error with your expression.</message> + </redirect> + </exception> + <exception class="org.jboss.seam.security.NotLoggedInException"> <redirect view-id="/home.xhtml"> <message severity="warn">You must be logged in to use this feature</message> Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/web.xml =================================================================== --- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/web.xml 2008-02-01 13:28:54 UTC (rev 227) +++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/web.xml 2008-02-05 20:13:36 UTC (rev 228) @@ -1,109 +1,105 @@ -<?xml version="1.0"?> -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - <description>JbossPortalSeamBookingPortlet</description> + <display-name>Seam Booking Example</display-name> + <context-param> + <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value> + org.ajax4jsf.portlet.application.FaceletPortletViewHandler + </param-value> + </context-param> + <context-param> + <param-name>org.ajax4jsf.portlet.ExceptionHandler</param-name> + <param-value> + org.ajax4jsf.portlet.SeamExceptionHandlerImpl + </param-value> + </context-param> + <context-param> + <param-name>javax.portlet.faces.renderPolicy</param-name> + <param-value>ALWAYS_DELEGATE</param-value> + </context-param> + <context-param> + <param-name>javax.portlet.faces.preserveActionParams</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>javax.faces.LIFECYCLE_ID</param-name> + <param-value>SEAM_PORTLET</param-value> + </context-param> + <context-param> + <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> + <param-value>rfRes</param-value> + </context-param> <context-param> - <param-name>javax.portlet.faces.BridgeImplClass</param-name> - <param-value>org.apache.myfaces.portlet.faces.bridge.BridgeImpl</param-value> + <param-name>org.richfaces.LoadStyleStrategy</param-name> + <param-value>NONE</param-value> </context-param> + <context-param> + <param-name>org.richfaces.LoadScriptStrategy</param-name> + <param-value>NONE</param-value> + </context-param> -  - <filter-mapping> - <filter-name>ajax4jsf</filter-name> - <servlet-name>Faces Servlet</servlet-name> - <dispatcher>FORWARD</dispatcher> - <dispatcher>REQUEST</dispatcher> - <dispatcher>INCLUDE</dispatcher> - </filter-mapping>--> -  + <listener> + <listener-class> + org.jboss.seam.servlet.SeamListener + </listener-class> + </listener> - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class> + org.jboss.seam.servlet.SeamResourceServlet + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.ResourceServlet</servlet-class> - </servlet> + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <servlet-name>FacesServlet</servlet-name> + <dispatcher>FORWARD</dispatcher> + <dispatcher>REQUEST</dispatcher> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> +  - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + <servlet> + <servlet-name>FacesServlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> -  -  -  + <servlet-mapping> + <servlet-name>FacesServlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> - <context-param> - <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>server</param-value> - </context-param> + <session-config> + <session-timeout>10</session-timeout> + </session-config> - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>false</param-value> - </context-param> - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - - <listener> - <listener-class>com.sun.faces.config.ConfigureListener</listener-class> - </listener> - - <session-config> - <session-timeout>30</session-timeout> - </session-config> - - <welcome-file-list> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - - -</web-app> \ No newline at end of file +</web-app> Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml =================================================================== --- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml 2008-02-01 13:28:54 UTC (rev 227) +++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml 2008-02-05 20:13:36 UTC (rev 228) @@ -58,14 +58,14 @@ <s:decorate id="creditCardDecorate" template="edit.xhtml"> <ui:define name="label">Credit Card #:</ui:define> <h:inputText id="creditCard" value="#{booking.creditCard}" required="true"> - <ui:remove><a:support event="onblur" reRender="creditCardDecorate"/></ui:remove> + <a:support event="onblur" reRender="creditCardDecorate"/> </h:inputText> </s:decorate> <s:decorate id="creditCardNameDecorate" template="edit.xhtml"> <ui:define name="label">Credit Card Name:</ui:define> <h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true"> - <ui:remove><a:support event="onblur" reRender="creditCardNameDecorate"/></ui:remove> + <a:support event="onblur" reRender="creditCardNameDecorate"/> </h:inputText> </s:decorate> Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/error.xhtml =================================================================== --- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/error.xhtml (rev 0) +++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/error.xhtml 2008-02-05 20:13:36 UTC (rev 228) @@ -0,0 +1,14 @@ +<ui:composition + xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + xmlns:s="http://jboss.com/products/seam/taglib"> + <s:message styleClass="error errors"/> + <h:form> + <h:messages/> + Error :( + </h:form> +</ui:composition> \ No newline at end of file Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/help.xhtml =================================================================== --- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/help.xhtml 2008-02-01 13:28:54 UTC (rev 227) +++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/help.xhtml 2008-02-05 20:13:36 UTC (rev 228) @@ -4,7 +4,9 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:rich="http://richfaces.org/rich" + xmlns:s="http://jboss.com/products/seam/taglib"> + <h:messages/> Help Mode </ui:composition> \ No newline at end of file Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml =================================================================== --- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml 2008-02-01 13:28:54 UTC (rev 227) +++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml 2008-02-05 20:13:36 UTC (rev 228) @@ -21,7 +21,7 @@ <h:form id="searchCriteria"> <fieldset> <h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;"> - <ui:remove><a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /></ui:remove> + <a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /> </h:inputText>   <h:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}"/> Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml =================================================================== --- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml 2008-02-01 13:28:54 UTC (rev 227) +++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml 2008-02-05 20:13:36 UTC (rev 228) @@ -59,14 +59,14 @@ <s:decorate id="usernameDecorate" template="edit.xhtml"> <ui:define name="label">Username:</ui:define> <h:inputText id="username" value="#{user.username}" required="true"> - <ui:remove><a:support event="onblur" reRender="usernameDecorate"/></ui:remove> + <a:support event="onblur" reRender="usernameDecorate"/> </h:inputText> </s:decorate> <s:decorate id="nameDecorate" template="edit.xhtml"> <ui:define name="label">Real Name:</ui:define> <h:inputText id="name" value="#{user.name}" required="true"> - <ui:remove><a:support event="onblur" reRender="nameDecorate"/></ui:remove> + <a:support event="onblur" reRender="nameDecorate"/> </h:inputText> </s:decorate>

16 years, 2 months

1
0
0 / 0

JBoss PortletSwap SVN: r227 - in src/server/trunk/server-service: server-lib/src/main/java/org/jboss/portletswap/repository/impl/jcr and 9 other directories.

by portletswap-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-02-01 08:28:54 -0500 (Fri, 01 Feb 2008) New Revision: 227 Added: src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/ src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/Compatibility.java src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/CompatibilityInconsistencyException.java src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/CompatibilityLevel.java src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/Environment.java src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/SameEnvironmentCompatibility.java src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/SameEnvironmentIncompatibility.java src/server/trunk/server-service/server-model/src/test/java/org/ src/server/trunk/server-service/server-model/src/test/java/org/jboss/ src/server/trunk/server-service/server-model/src/test/java/org/jboss/portletswap/ src/server/trunk/server-service/server-model/src/test/java/org/jboss/portletswap/model/ src/server/trunk/server-service/server-model/src/test/java/org/jboss/portletswap/model/CompatibilityTestCase.java Removed: src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/CompatibilityLevel.java Modified: src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/model/impl/jcr/JCRArtifactImpl.java src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/repository/impl/jcr/NodeFactory.java src/server/trunk/server-service/server-lib/src/main/resources/customNodes.cnd src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/repository/impl/jcr/RepositoryServiceTestCase.java src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/Artifact.java src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/CompatibilityList.java Log: CompatibilityList rough implementation Modified: src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/model/impl/jcr/JCRArtifactImpl.java =================================================================== --- src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/model/impl/jcr/JCRArtifactImpl.java 2008-01-28 13:27:30 UTC (rev 226) +++ src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/model/impl/jcr/JCRArtifactImpl.java 2008-02-01 13:28:54 UTC (rev 227) @@ -35,8 +35,13 @@ import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portletswap.jcr.JCRService; import org.jboss.portletswap.model.Artifact; +import org.jboss.portletswap.model.CompatibilityList; import org.jboss.portletswap.model.Type; import org.jboss.portletswap.model.Version; +import org.jboss.portletswap.model.compatibility.Compatibility; +import org.jboss.portletswap.model.compatibility.Environment; +import org.jboss.portletswap.model.compatibility.SameEnvironmentCompatibility; +import org.jboss.portletswap.model.compatibility.SameEnvironmentIncompatibility; /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> @@ -118,7 +123,67 @@ Version version = new JCRVersionImpl(versionNode); artifact.setVersion(version); + Node compatibilityListNode = null; + try + { + compatibilityListNode = node.getNode("ps:compatibilityList"); + } + catch (PathNotFoundException e) + { + // ignore + } + + if (compatibilityListNode != null) + { + CompatibilityList compatibilityList = new CompatibilityList(); + it = compatibilityListNode.getNodes("ps:compatibility"); + while (it.hasNext()) + { + Node tmpNode = it.nextNode(); + Node tmpVersionNode = tmpNode.getNode("ps:asVersion"); + int major = (int)tmpVersionNode.getProperty("ps:major").getValue().getLong(); + int minor = (int)tmpVersionNode.getProperty("ps:minor").getValue().getLong(); + int patch = (int)tmpVersionNode.getProperty("ps:patch").getValue().getLong(); + String prefix = tmpVersionNode.getProperty("ps:prefix").getValue().getString(); + String suffix = tmpVersionNode.getProperty("ps:suffix").getValue().getString(); + Version tmpASVersion = new Version(major, minor, patch, new Version.Qualifier(Version.Qualifier.Prefix.valueOf(prefix), Version.Qualifier.Suffix.valueOf(suffix))); + + tmpVersionNode = tmpNode.getNode("ps:jdkVersion"); + major = (int)tmpVersionNode.getProperty("ps:major").getValue().getLong(); + minor = (int)tmpVersionNode.getProperty("ps:minor").getValue().getLong(); + patch = (int)tmpVersionNode.getProperty("ps:patch").getValue().getLong(); + prefix = tmpVersionNode.getProperty("ps:prefix").getValue().getString(); + suffix = tmpVersionNode.getProperty("ps:suffix").getValue().getString(); + Version tmpJDKVersion = new Version(major, minor, patch, new Version.Qualifier(Version.Qualifier.Prefix.valueOf(prefix), Version.Qualifier.Suffix.valueOf(suffix))); + + tmpVersionNode = tmpNode.getNode("ps:jbpVersion"); + major = (int)tmpVersionNode.getProperty("ps:major").getValue().getLong(); + minor = (int)tmpVersionNode.getProperty("ps:minor").getValue().getLong(); + patch = (int)tmpVersionNode.getProperty("ps:patch").getValue().getLong(); + prefix = tmpVersionNode.getProperty("ps:prefix").getValue().getString(); + suffix = tmpVersionNode.getProperty("ps:suffix").getValue().getString(); + Version tmpJBPVersion = new Version(major, minor, patch, new Version.Qualifier(Version.Qualifier.Prefix.valueOf(prefix), Version.Qualifier.Suffix.valueOf(suffix))); + + Environment environment = new Environment(); + environment.setAsVersion(tmpASVersion); + environment.setJbpVersion(tmpJBPVersion); + environment.setJdkVersion(tmpJDKVersion); + + + Compatibility comp = null; + if (tmpNode.isNodeType("ps:sameEnvironmentCompatibility")) + { + comp = new SameEnvironmentCompatibility(environment); + + } + else if (tmpNode.isNodeType("ps:sameEnvironmentIncompatibility")) + { + comp = new SameEnvironmentIncompatibility(environment); + } + compatibilityList.add(comp); + } + artifact.setCompatibilityList(compatibilityList); + } } - } Modified: src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/repository/impl/jcr/NodeFactory.java =================================================================== --- src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/repository/impl/jcr/NodeFactory.java 2008-01-28 13:27:30 UTC (rev 226) +++ src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/repository/impl/jcr/NodeFactory.java 2008-02-01 13:28:54 UTC (rev 227) @@ -37,10 +37,14 @@ import org.jboss.portletswap.model.Artifact; import org.jboss.portletswap.model.Author; import org.jboss.portletswap.model.Category; +import org.jboss.portletswap.model.CompatibilityList; import org.jboss.portletswap.model.FileArtifact; import org.jboss.portletswap.model.License; import org.jboss.portletswap.model.Module; import org.jboss.portletswap.model.Version; +import org.jboss.portletswap.model.compatibility.Compatibility; +import org.jboss.portletswap.model.compatibility.SameEnvironmentCompatibility; +import org.jboss.portletswap.model.compatibility.SameEnvironmentIncompatibility; import org.jboss.portletswap.model.impl.jcr.JCRArtifactImpl; import org.jboss.portletswap.model.impl.jcr.JCRAuthorImpl; import org.jboss.portletswap.model.impl.jcr.JCRCategoryImpl; @@ -92,6 +96,13 @@ createLocalizedStringNode(artifactNode, "ps:displayName", displayName); } + // Store the compatibility list + CompatibilityList compatibilityList = artifact.getCompatibilityList(); + if (compatibilityList != null) + { + createCompatibilityNode(artifactNode, compatibilityList); + } + return artifactNode; } @@ -179,5 +190,62 @@ } return node; } + + public static Node createCompatibilityNode(Node parent, CompatibilityList list) throws RepositoryException + { + Node node = parent.addNode("ps:compatibilityList", "ps:compatibilityList"); + for(Compatibility compatibility: list.getCompatibilities()) + { + if (compatibility instanceof SameEnvironmentCompatibility) + { + SameEnvironmentCompatibility compat = (SameEnvironmentCompatibility)compatibility; + Node compNode = node.addNode("ps:compatibility", "ps:sameEnvironmentCompatibility"); + createVersionNode(compNode, "ps:asVersion", compat.getEnvironment().getAsVersion()); + createVersionNode(compNode, "ps:jbpVersion", compat.getEnvironment().getJbpVersion()); + createVersionNode(compNode, "ps:jdkVersion", compat.getEnvironment().getJdkVersion()); + } + else if (compatibility instanceof SameEnvironmentIncompatibility) + { + SameEnvironmentIncompatibility compat = (SameEnvironmentIncompatibility)compatibility; + Node compNode = node.addNode("ps:compatibility", "ps:sameEnvironmentIncompatibility"); + createVersionNode(compNode, "ps:asVersion", compat.getEnvironment().getAsVersion()); + createVersionNode(compNode, "ps:jbpVersion", compat.getEnvironment().getJbpVersion()); + createVersionNode(compNode, "ps:jdkVersion", compat.getEnvironment().getJdkVersion()); + } + } + return node; + } + + public static Node createVersionNode(Node parent, String nodeType, Version version) throws RepositoryException + { + Node versionNode = parent.addNode(nodeType, nodeType); + int nb = version.getMajor(); + if (nb != -1) + { + versionNode.setProperty("ps:major", nb); + } + nb = version.getMinor(); + if (nb != -1) + { + versionNode.setProperty("ps:minor", nb); + } + nb = version.getPatch(); + if (nb != -1) + { + versionNode.setProperty("ps:patch", nb); + } + Version.Qualifier qualifier = version.getQualifier(); + if (qualifier != null) + { + versionNode.setProperty("ps:prefix", qualifier.getPrefix().name()); + } + if (qualifier.getSuffix() != null) + { + versionNode.setProperty("ps:suffix", qualifier.getSuffix().name()); + + } + return versionNode; + } + } Modified: src/server/trunk/server-service/server-lib/src/main/resources/customNodes.cnd =================================================================== --- src/server/trunk/server-service/server-lib/src/main/resources/customNodes.cnd 2008-01-28 13:27:30 UTC (rev 226) +++ src/server/trunk/server-service/server-lib/src/main/resources/customNodes.cnd 2008-02-01 13:28:54 UTC (rev 227) @@ -33,12 +33,25 @@ [ps:artifacts] > nt:folder + ps:artifact multiple +[ps:compatibilityList] > nt:base + + ps:compatibility multiple + +[ps:compatibility] > nt:base + + ps:asVersion + + ps:jbpVersion + + ps:jdkVersion + +[ps:sameEnvironmentCompatibility] > ps:compatibility + +[ps:sameEnvironmentIncompatibility] > ps:compatibility + [ps:artifact] > nt:base, mix:referenceable - jcr:lastModified (date) mandatory ignore - ps:module (reference) mandatory - ps:license (reference) - ps:type (string) mandatory + ps:version mandatory + + ps:compatibilityList [ps:fileArtifact] > ps:artifact - ps:inputStream (binary) @@ -59,4 +72,10 @@ - ps:patch mandatory - ps:prefix mandatory - ps:suffix + + [ps:asVersion] > ps:version + + [ps:jdkVersion] > ps:version + + [ps:jbpVersion] > ps:version \ No newline at end of file Modified: src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/repository/impl/jcr/RepositoryServiceTestCase.java =================================================================== --- src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/repository/impl/jcr/RepositoryServiceTestCase.java 2008-01-28 13:27:30 UTC (rev 226) +++ src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/repository/impl/jcr/RepositoryServiceTestCase.java 2008-02-01 13:28:54 UTC (rev 227) @@ -42,11 +42,14 @@ import org.jboss.portletswap.jcr.JCRServiceImpl; import org.jboss.portletswap.model.Artifact; import org.jboss.portletswap.model.Category; +import org.jboss.portletswap.model.CompatibilityList; import org.jboss.portletswap.model.FileArtifact; import org.jboss.portletswap.model.License; import org.jboss.portletswap.model.Module; import org.jboss.portletswap.model.Type; import org.jboss.portletswap.model.Version; +import org.jboss.portletswap.model.compatibility.Environment; +import org.jboss.portletswap.model.compatibility.SameEnvironmentCompatibility; import org.jboss.portletswap.repository.NotFoundException; import org.jboss.unit.api.pojo.annotations.Create; import org.jboss.unit.api.pojo.annotations.Destroy; @@ -339,16 +342,51 @@ FileArtifact getArtifact = (FileArtifact)artifacts.get(0); assertNotNull(getArtifact); assertNotNull(getArtifact.getInputStream()); + } + + @Test + public void testAddArtifactWithCompatibilityList() throws Exception + { + Module module = new Module("Test"); + assertNull(module.getId()); + module = repositoryService.storeModule(module); + + Version version = new Version(1, 0, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA)); -// FileOutputStream fos = new FileOutputStream("/tmp/foobarou"); -// -// byte[] buf = new byte[256]; -// int read = 0; -// while ((read = getArtifact.getInputStream().read(buf)) > 0) { -// fos.write(buf, 0, read); -// } -// + InputStream is = new FileInputStream("/tmp/test"); + Artifact artifact = new FileArtifact(Type.JSR168PORTLET, module, new File("/tmp/test"), is); + ((Artifact)artifact).setName("Bozo"); + artifact.setVersion(version); + License license = new License("LGPL", "blah"); + license = repositoryService.storeLicense(license); + artifact.setLicense(license); + + CompatibilityList compatibilityList = new CompatibilityList(); + Environment environment = new Environment(); + environment.setAsVersion(new Version(4, 2, 2, new Version.Qualifier(Version.Qualifier.Prefix.GA))); + environment.setJbpVersion(new Version(2, 6, 3, new Version.Qualifier(Version.Qualifier.Prefix.GA))); + environment.setJdkVersion(new Version(1, 5, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA))); + SameEnvironmentCompatibility compatibility = new SameEnvironmentCompatibility(environment); + compatibilityList.add(compatibility); + + artifact.setCompatibilityList(compatibilityList); + + artifact = repositoryService.storeArtifact(artifact); + + List<Artifact> artifacts = module.getArtifacts(); + assertEquals(1, artifacts.size()); + + FileArtifact getArtifact = (FileArtifact)artifacts.get(0); + assertNotNull(getArtifact); + assertNotNull(getArtifact.getInputStream()); +// compatibility = (SameEnvironmentCompatibility) getArtifact.getCompatibilityList().getCompatibilities().get(0); +// assertNotNull(compatibility); +// assertEquals(3, compatibility.getEnvironment().getJbpVersion().getPatch()); + compatibilityList = getArtifact.getCompatibilityList(); + assertNotNull(compatibilityList); } + + } Modified: src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/Artifact.java =================================================================== --- src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/Artifact.java 2008-01-28 13:27:30 UTC (rev 226) +++ src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/Artifact.java 2008-02-01 13:28:54 UTC (rev 227) @@ -167,5 +167,6 @@ { this.module = module; } + } Deleted: src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/CompatibilityLevel.java =================================================================== --- src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/CompatibilityLevel.java 2008-01-28 13:27:30 UTC (rev 226) +++ src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/CompatibilityLevel.java 2008-02-01 13:28:54 UTC (rev 227) @@ -1,33 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portletswap.model; - -/** - * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ - */ -public enum CompatibilityLevel { - - COMPATIBLE, INCOMPATIBLE, UNKNOWN -} - Modified: src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/CompatibilityList.java =================================================================== --- src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/CompatibilityList.java 2008-01-28 13:27:30 UTC (rev 226) +++ src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/CompatibilityList.java 2008-02-01 13:28:54 UTC (rev 227) @@ -22,12 +22,82 @@ ******************************************************************************/ package org.jboss.portletswap.model; +import java.util.ArrayList; +import java.util.List; + +import org.jboss.portletswap.model.compatibility.Compatibility; +import org.jboss.portletswap.model.compatibility.CompatibilityInconsistencyException; +import org.jboss.portletswap.model.compatibility.CompatibilityLevel; +import org.jboss.portletswap.model.compatibility.Environment; + /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ */ public class CompatibilityList { + private List<Compatibility> compatibilities = new ArrayList<Compatibility>(); + public CompatibilityLevel getCompatibilityLevel(Environment env) throws CompatibilityInconsistencyException + { + int compatibilityValue = 0; + CompatibilityLevel result = null; + int counter = 0; + + for (Compatibility compatibility: compatibilities) + { + CompatibilityLevel compatibilityLevel = compatibility.getCompatibilityLevel(env); + if (compatibilityLevel.getCompatibilityValue() == CompatibilityLevel.COMPATIBLE_LEVEL_VALUE) + { + // we always go ahead to check for inconsistencies + if ((result == null) || (result.getCompatibilityValue() != CompatibilityLevel.INCOMPATIBLE_LEVEL_VALUE)) + { + result = CompatibilityLevel.COMPATIBLE_LEVEL; + } + else + { + throw new CompatibilityInconsistencyException(); + } + } + else if (compatibilityLevel.getCompatibilityValue() == CompatibilityLevel.INCOMPATIBLE_LEVEL_VALUE) + { + // we always go ahead to check for inconsistencies + if ((result == null) || (result.getCompatibilityValue() != CompatibilityLevel.COMPATIBLE_LEVEL_VALUE)) + { + // It is compatible and we are sure + result = CompatibilityLevel.INCOMPATIBLE_LEVEL; + } + else + { + throw new CompatibilityInconsistencyException(); + } + } + else + { + counter++; + compatibilityValue += compatibilityLevel.getCompatibilityValue() / counter; + } + } + + if (result != null) + { + return result; + } + else + { + return new CompatibilityLevel(compatibilityValue); + } + } + + public void add(Compatibility compatibility) + { + compatibilities.add(compatibility); + } + + public List<Compatibility> getCompatibilities() + { + return compatibilities; + } + } Added: src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/Compatibility.java =================================================================== --- src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/Compatibility.java (rev 0) +++ src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/Compatibility.java 2008-02-01 13:28:54 UTC (rev 227) @@ -0,0 +1,39 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portletswap.model.compatibility; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public interface Compatibility +{ + public CompatibilityLevel getCompatibilityLevel(Environment env); + + + public enum Limit + { + MAJOR, MINOR, PATCH, QUALIFIER + } +} + Added: src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/CompatibilityInconsistencyException.java =================================================================== --- src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/CompatibilityInconsistencyException.java (rev 0) +++ src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/CompatibilityInconsistencyException.java 2008-02-01 13:28:54 UTC (rev 227) @@ -0,0 +1,36 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portletswap.model.compatibility; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class CompatibilityInconsistencyException extends Exception +{ + + /** The serialVersionUID */ + private static final long serialVersionUID = -5526741312515506855L; + +} + Copied: src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/CompatibilityLevel.java (from rev 224, src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/CompatibilityLevel.java) =================================================================== --- src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/CompatibilityLevel.java (rev 0) +++ src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/CompatibilityLevel.java 2008-02-01 13:28:54 UTC (rev 227) @@ -0,0 +1,55 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portletswap.model.compatibility; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class CompatibilityLevel { + + private int compatibilityValue; + + public static final int COMPATIBLE_LEVEL_VALUE = 100; + + public static final int UNKNOWN_LEVEL_VALUE = 0; + + public static final int INCOMPATIBLE_LEVEL_VALUE = -100; + + public static CompatibilityLevel COMPATIBLE_LEVEL = new CompatibilityLevel(COMPATIBLE_LEVEL_VALUE); + + public static CompatibilityLevel INCOMPATIBLE_LEVEL = new CompatibilityLevel(INCOMPATIBLE_LEVEL_VALUE); + + public static CompatibilityLevel UNKNOWN_LEVEL = new CompatibilityLevel(UNKNOWN_LEVEL_VALUE); + + public CompatibilityLevel(int compatibilityValue) + { + this.compatibilityValue = compatibilityValue; + } + + public int getCompatibilityValue() + { + return compatibilityValue; + } +} + Added: src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/Environment.java =================================================================== --- src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/Environment.java (rev 0) +++ src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/Environment.java 2008-02-01 13:28:54 UTC (rev 227) @@ -0,0 +1,70 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portletswap.model.compatibility; + +import org.jboss.portletswap.model.Version; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class Environment +{ + + private Version asVersion; + + private Version jbpVersion; + + private Version jdkVersion; + + public Version getAsVersion() + { + return asVersion; + } + + public void setAsVersion(Version asVersion) + { + this.asVersion = asVersion; + } + + public Version getJbpVersion() + { + return jbpVersion; + } + + public void setJbpVersion(Version jbpVersion) + { + this.jbpVersion = jbpVersion; + } + + public Version getJdkVersion() + { + return jdkVersion; + } + + public void setJdkVersion(Version jdkVersion) + { + this.jdkVersion = jdkVersion; + } +} + Added: src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/SameEnvironmentCompatibility.java =================================================================== --- src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/SameEnvironmentCompatibility.java (rev 0) +++ src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/SameEnvironmentCompatibility.java 2008-02-01 13:28:54 UTC (rev 227) @@ -0,0 +1,108 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portletswap.model.compatibility; + +import org.jboss.portletswap.model.Version; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class SameEnvironmentCompatibility implements Compatibility +{ + private Environment env; + + private Limit asLimit; + + private Limit jbpLimit; + + private Limit jdkLimit; + + public SameEnvironmentCompatibility(Environment env) + { + this(env, Limit.QUALIFIER, Limit.QUALIFIER, Limit.QUALIFIER); + } + + public SameEnvironmentCompatibility(Environment env, Limit asLimit, Limit jbpLimit, Limit jdkLimit) + { + this.env = env; + this.asLimit = asLimit; + this.jbpLimit = jbpLimit; + this.jdkLimit = jdkLimit; + } + + public CompatibilityLevel getCompatibilityLevel(Environment compare) + { + if ((isCompatible(env.getAsVersion(), compare.getAsVersion(), asLimit)) && + (isCompatible(env.getJbpVersion(), compare.getJbpVersion(), jbpLimit)) && + (isCompatible(env.getJdkVersion(), compare.getJdkVersion(), jdkLimit))) + { + return CompatibilityLevel.COMPATIBLE_LEVEL; + } + else + { + return CompatibilityLevel.UNKNOWN_LEVEL; + } + } + + public boolean isCompatible(Version from, Version to, Limit limit) + { + if (from.getMajor() == to.getMajor()) + { + if (limit.equals(Limit.MAJOR)) + { + return true; + } + if (from.getMinor() == to.getMinor()) + { + if (limit.equals(Limit.MINOR)) + { + return true; + } + if (from.getPatch() == to.getPatch()) + { + if (limit.equals(Limit.PATCH)) + { + return true; + } + if (from.getQualifier().equals(to.getQualifier())) + { + if (limit.equals(Limit.QUALIFIER)) + { + return true; + } + } + } + + } + + } + return false; + } + + public Environment getEnvironment() + { + return env; + } +} + Added: src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/SameEnvironmentIncompatibility.java =================================================================== --- src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/SameEnvironmentIncompatibility.java (rev 0) +++ src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/compatibility/SameEnvironmentIncompatibility.java 2008-02-01 13:28:54 UTC (rev 227) @@ -0,0 +1,110 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portletswap.model.compatibility; + +import org.jboss.portletswap.model.Version; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class SameEnvironmentIncompatibility implements Compatibility +{ + private Environment env; + + private Limit asLimit; + + private Limit jbpLimit; + + private Limit jdkLimit; + + public SameEnvironmentIncompatibility(Environment env) + { + this(env, Limit.QUALIFIER, Limit.QUALIFIER, Limit.QUALIFIER); + } + + public SameEnvironmentIncompatibility(Environment env, Limit asLimit, Limit jbpLimit, Limit jdkLimit) + { + this.env = env; + this.asLimit = asLimit; + this.jbpLimit = jbpLimit; + this.jdkLimit = jdkLimit; + } + + public CompatibilityLevel getCompatibilityLevel(Environment compare) + { + if ((isIncompatible(env.getAsVersion(), compare.getAsVersion(), asLimit)) || + (isIncompatible(env.getJbpVersion(), compare.getJbpVersion(), jbpLimit)) || + (isIncompatible(env.getJdkVersion(), compare.getJdkVersion(), jdkLimit))) + { + return CompatibilityLevel.INCOMPATIBLE_LEVEL; + } + else + { + return CompatibilityLevel.UNKNOWN_LEVEL; + } + } + + public boolean isIncompatible(Version from, Version to, Limit limit) + { + if (from.getMajor() == to.getMajor()) + { + if (limit.equals(Limit.MAJOR)) + { + return true; + } + if (from.getMinor() == to.getMinor()) + { + if (limit.equals(Limit.MINOR)) + { + return true; + } + if (from.getPatch() == to.getPatch()) + { + if (limit.equals(Limit.PATCH)) + { + return true; + } + if (from.getQualifier().equals(to.getQualifier())) + { + if (limit.equals(Limit.QUALIFIER)) + { + return true; + } + } + } + + } + + } + return false; + } + + public Environment getEnvironment() + { + return env; + } + + +} + Added: src/server/trunk/server-service/server-model/src/test/java/org/jboss/portletswap/model/CompatibilityTestCase.java =================================================================== --- src/server/trunk/server-service/server-model/src/test/java/org/jboss/portletswap/model/CompatibilityTestCase.java (rev 0) +++ src/server/trunk/server-service/server-model/src/test/java/org/jboss/portletswap/model/CompatibilityTestCase.java 2008-02-01 13:28:54 UTC (rev 227) @@ -0,0 +1,214 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portletswap.model; + +import org.jboss.portletswap.model.compatibility.CompatibilityInconsistencyException; +import org.jboss.portletswap.model.compatibility.CompatibilityLevel; +import org.jboss.portletswap.model.compatibility.Environment; +import org.jboss.portletswap.model.compatibility.SameEnvironmentCompatibility; +import org.jboss.portletswap.model.compatibility.SameEnvironmentIncompatibility; +import org.jboss.portletswap.model.compatibility.Compatibility.Limit; + +import junit.framework.TestCase; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class CompatibilityTestCase extends TestCase +{ + + public void testSimple() throws CompatibilityInconsistencyException + { + Artifact artifact = new FileArtifact(); + CompatibilityList compatibilityList = new CompatibilityList(); + artifact.setCompatibilityList(compatibilityList); + + Version asVersion = new Version(4, 2, 2, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jbpVersion = new Version(2, 6, 3, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jdkVersion = new Version(1, 5, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + + Environment env = new Environment(); + env.setAsVersion(asVersion); + env.setJbpVersion(jbpVersion); + env.setJdkVersion(jdkVersion); + + CompatibilityLevel compatibilityLevel = artifact.getCompatibilityList().getCompatibilityLevel(env); + assertEquals(CompatibilityLevel.UNKNOWN_LEVEL_VALUE, compatibilityLevel.getCompatibilityValue()); + } + + public void testExactVersion() throws CompatibilityInconsistencyException + { + Artifact artifact = new FileArtifact(); + CompatibilityList compatibilityList = new CompatibilityList(); + + Version asVersion = new Version(4, 2, 2, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jbpVersion = new Version(2, 6, 3, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jdkVersion = new Version(1, 5, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + + Environment env = new Environment(); + env.setAsVersion(asVersion); + env.setJbpVersion(jbpVersion); + env.setJdkVersion(jdkVersion); + + Environment compatible = env; + SameEnvironmentCompatibility envCompatibility = new SameEnvironmentCompatibility(compatible); + + compatibilityList.add(envCompatibility); + + artifact.setCompatibilityList(compatibilityList); + + CompatibilityLevel compatibilityLevel = artifact.getCompatibilityList().getCompatibilityLevel(env); + assertEquals(CompatibilityLevel.COMPATIBLE_LEVEL_VALUE, compatibilityLevel.getCompatibilityValue()); + } + + public void testExactVersionIncompatibility() throws CompatibilityInconsistencyException + { + Artifact artifact = new FileArtifact(); + CompatibilityList compatibilityList = new CompatibilityList(); + + Version asVersion = new Version(4, 2, 2, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jbpVersion = new Version(2, 6, 3, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jdkVersion = new Version(1, 5, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + + Environment env = new Environment(); + env.setAsVersion(asVersion); + env.setJbpVersion(jbpVersion); + env.setJdkVersion(jdkVersion); + + Environment incompatible = env; + SameEnvironmentIncompatibility envIncompatibility = new SameEnvironmentIncompatibility(incompatible); + + compatibilityList.add(envIncompatibility); + + artifact.setCompatibilityList(compatibilityList); + + CompatibilityLevel compatibilityLevel = artifact.getCompatibilityList().getCompatibilityLevel(env); + assertEquals(CompatibilityLevel.INCOMPATIBLE_LEVEL_VALUE, compatibilityLevel.getCompatibilityValue()); + } + + + public void testInconsistencyVersion() + { + Artifact artifact = new FileArtifact(); + CompatibilityList compatibilityList = new CompatibilityList(); + + Version asVersion = new Version(4, 2, 2, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jbpVersion = new Version(2, 6, 3, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jdkVersion = new Version(1, 5, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + + Environment env = new Environment(); + env.setAsVersion(asVersion); + env.setJbpVersion(jbpVersion); + env.setJdkVersion(jdkVersion); + + Environment compatible = env; + SameEnvironmentCompatibility envCompatibility = new SameEnvironmentCompatibility(compatible); + compatibilityList.add(envCompatibility); + + SameEnvironmentIncompatibility envIncompatibility = new SameEnvironmentIncompatibility(compatible); + compatibilityList.add(envIncompatibility); + + artifact.setCompatibilityList(compatibilityList); + + boolean exception = false; + CompatibilityLevel compatibilityLevel = null; + try + { + compatibilityLevel = artifact.getCompatibilityList().getCompatibilityLevel(env); + } + catch (CompatibilityInconsistencyException e) + { + exception = true; + } + assertTrue(exception); + assertNull(compatibilityLevel); + } + + public void testExactVersionIncompatibility2() throws CompatibilityInconsistencyException + { + Artifact artifact = new FileArtifact(); + CompatibilityList compatibilityList = new CompatibilityList(); + + Version asVersion = new Version(4, 2, 2, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jbpVersion = new Version(2, 6, 3, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jdkVersion = new Version(1, 5, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + + Environment env = new Environment(); + env.setAsVersion(asVersion); + env.setJbpVersion(jbpVersion); + env.setJdkVersion(jdkVersion); + + Version asVersion2 = new Version(4, 2, 2, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jbpVersion2 = new Version(2, 6, 2, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jdkVersion2 = new Version(1, 5, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + + Environment incompatible = new Environment(); + incompatible.setAsVersion(asVersion2); + incompatible.setJbpVersion(jbpVersion2); + incompatible.setJdkVersion(jdkVersion2); + + SameEnvironmentIncompatibility envIncompatibility = new SameEnvironmentIncompatibility(incompatible); + + compatibilityList.add(envIncompatibility); + + artifact.setCompatibilityList(compatibilityList); + + CompatibilityLevel compatibilityLevel = artifact.getCompatibilityList().getCompatibilityLevel(env); + assertEquals(CompatibilityLevel.UNKNOWN_LEVEL_VALUE, compatibilityLevel.getCompatibilityValue()); + } + + public void testExactVersionIncompatibility3() throws CompatibilityInconsistencyException + { + Artifact artifact = new FileArtifact(); + CompatibilityList compatibilityList = new CompatibilityList(); + + Version asVersion = new Version(4, 2, 2, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jbpVersion = new Version(2, 6, 3, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jdkVersion = new Version(1, 5, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + + Environment env = new Environment(); + env.setAsVersion(asVersion); + env.setJbpVersion(jbpVersion); + env.setJdkVersion(jdkVersion); + + Version asVersion2 = new Version(4, 2, 2, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jbpVersion2 = new Version(2, 6, 2, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + Version jdkVersion2 = new Version(1, 5, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA)); + + Environment incompatible = new Environment(); + incompatible.setAsVersion(asVersion2); + incompatible.setJbpVersion(jbpVersion2); + incompatible.setJdkVersion(jdkVersion2); + + SameEnvironmentIncompatibility envIncompatibility = new SameEnvironmentIncompatibility(incompatible, Limit.QUALIFIER, Limit.MINOR, Limit.QUALIFIER); + + compatibilityList.add(envIncompatibility); + + artifact.setCompatibilityList(compatibilityList); + + CompatibilityLevel compatibilityLevel = artifact.getCompatibilityList().getCompatibilityLevel(env); + assertEquals(CompatibilityLevel.INCOMPATIBLE_LEVEL_VALUE, compatibilityLevel.getCompatibilityValue()); + } +} +

16 years, 2 months

1
0
0 / 0

← Newer
1
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

portletswap-commits February 2008