You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by sc...@apache.org on 2010/08/23 11:46:43 UTC
svn commit: r988048 [1/6] - in /incubator/wookie/trunk: ./
WebContent/WEB-INF/ WebContent/admin/ WebContent/deploy/
WebContent/webmenu/ WebContent/wservices/notsupported/
WebContent/wservices/notsupported/locales/
WebContent/wservices/notsupported/loca...
Author: scottbw
Date: Mon Aug 23 09:46:30 2010
New Revision: 988048
URL: http://svn.apache.org/viewvc?rev=988048&view=rev
Log:
Merging in the Pluggable Persistence branch into the Wookie trunk. This replaces the Hibernate persistence mechanism with a new pluggable framework developed by Randy Watler (thanks Randy!) that has implementations using JPA and JCR, with the possibility of adding other persistence options in the future.
Added:
incubator/wookie/trunk/etc/ddl-schema/
- copied from r988031, incubator/wookie/branches/pluggablepersistence/etc/ddl-schema/
incubator/wookie/trunk/etc/ddl-schema/wookie-schema.xml
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/etc/ddl-schema/wookie-schema.xml
incubator/wookie/trunk/etc/tomcat/
- copied from r988031, incubator/wookie/branches/pluggablepersistence/etc/tomcat/
incubator/wookie/trunk/etc/tomcat/conf/
- copied from r988031, incubator/wookie/branches/pluggablepersistence/etc/tomcat/conf/
incubator/wookie/trunk/etc/tomcat/conf/jcr-context.xml
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/etc/tomcat/conf/jcr-context.xml
incubator/wookie/trunk/etc/tomcat/conf/jpa-context.xml
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/etc/tomcat/conf/jpa-context.xml
incubator/wookie/trunk/etc/tomcat/conf/repository.xml
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/etc/tomcat/conf/repository.xml
incubator/wookie/trunk/src-tests/jndi.properties
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src-tests/jndi.properties
incubator/wookie/trunk/src-tests/log4j.xml
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src-tests/log4j.xml
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/beans/
- copied from r988031, incubator/wookie/branches/pluggablepersistence/src-tests/org/apache/wookie/tests/beans/
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/beans/AbstractPersistenceTest.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src-tests/org/apache/wookie/tests/beans/AbstractPersistenceTest.java
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/beans/JCRPersistenceTest.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src-tests/org/apache/wookie/tests/beans/JCRPersistenceTest.java
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/beans/JPAPersistenceTest.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src-tests/org/apache/wookie/tests/beans/JPAPersistenceTest.java
incubator/wookie/trunk/src/META-INF/
- copied from r988031, incubator/wookie/branches/pluggablepersistence/src/META-INF/
incubator/wookie/trunk/src/META-INF/persistence.xml
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/META-INF/persistence.xml
incubator/wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/PreferenceDelegate.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/ajaxmodel/impl/PreferenceDelegate.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IAccessRequest.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IAccessRequest.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IApiKey.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IApiKey.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IBean.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IBean.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IDescription.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IDescription.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IFeature.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IFeature.java
incubator/wookie/trunk/src/org/apache/wookie/beans/ILicense.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/ILicense.java
incubator/wookie/trunk/src/org/apache/wookie/beans/ILocalizedBean.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/ILocalizedBean.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IName.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IName.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IParam.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IParam.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IParticipant.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IParticipant.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IPost.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IPost.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IPreference.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IPreference.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IPreferenceDefault.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IPreferenceDefault.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IServerFeature.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IServerFeature.java
incubator/wookie/trunk/src/org/apache/wookie/beans/ISharedData.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/ISharedData.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IStartFile.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IStartFile.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IToken.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IToken.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IWhitelist.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IWhitelist.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IWidget.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetDefault.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IWidgetDefault.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetIcon.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IWidgetIcon.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IWidgetInstance.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetService.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IWidgetService.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetType.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/IWidgetType.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/
- copied from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/IIdElement.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/IIdElement.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/IInverseRelationship.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/IInverseRelationship.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/IPathBean.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/IPathBean.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/IPersistenceListener.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/IPersistenceListener.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/IUuidBean.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/IUuidBean.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/IdCollection.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/IdCollection.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/InverseRelationshipCollection.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/InverseRelationshipCollection.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/PersistenceListenerAdapter.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/PersistenceListenerAdapter.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/
- copied from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/AccessRequestImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/AccessRequestImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/ApiKeyImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/ApiKeyImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/DescriptionImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/DescriptionImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/FeatureImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/FeatureImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/LicenseImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/LicenseImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/LocalizedBeanImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/LocalizedBeanImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/NameImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/NameImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/ParamImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/ParamImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/ParticipantImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/ParticipantImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/PostImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/PostImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/PreferenceDefaultImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/PreferenceDefaultImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/PreferenceImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/PreferenceImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/ServerFeatureImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/ServerFeatureImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/SharedDataImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/SharedDataImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/StartFileImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/StartFileImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/TokenImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/TokenImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WhitelistImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/WhitelistImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetDefaultImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/WidgetDefaultImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetIconImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/WidgetIconImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetInstanceImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/WidgetInstanceImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetServiceImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/WidgetServiceImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetTypeImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/impl/WidgetTypeImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/wookie-schema.cnd
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jcr/wookie-schema.cnd
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/
- copied from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/IInverseRelationship.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/IInverseRelationship.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/InverseRelationshipCollection.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/InverseRelationshipCollection.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/SQLScriptReader.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/SQLScriptReader.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/
- copied from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/AccessRequestImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/AccessRequestImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/ApiKeyImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/ApiKeyImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/DescriptionImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/DescriptionImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/FeatureImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/FeatureImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/LicenseImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/LicenseImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/LocalizedBeanImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/LocalizedBeanImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/NameImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/NameImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/ParamImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/ParamImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/ParticipantImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/ParticipantImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/PostImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/PostImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/PreferenceDefaultImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/PreferenceDefaultImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/PreferenceImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/PreferenceImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/ServerFeatureImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/ServerFeatureImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/SharedDataImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/SharedDataImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/StartFileImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/StartFileImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/TokenImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/TokenImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WhitelistImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/WhitelistImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetDefaultImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/WidgetDefaultImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetIconImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/WidgetIconImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetInstanceImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/WidgetInstanceImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetServiceImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/WidgetServiceImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetTypeImpl.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/impl/WidgetTypeImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/persistence.properties
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/jpa/persistence.properties
incubator/wookie/trunk/src/org/apache/wookie/beans/util/
- copied from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/util/
incubator/wookie/trunk/src/org/apache/wookie/beans/util/IPersistenceManager.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/util/IPersistenceManager.java
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceCommitException.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/util/PersistenceCommitException.java
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
- copied unchanged from r988031, incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
Removed:
incubator/wookie/trunk/src/c3p0.properties
incubator/wookie/trunk/src/org/apache/wookie/beans/AbstractKeyBean.java
incubator/wookie/trunk/src/org/apache/wookie/beans/AbstractLocalizedKeyBean.java
incubator/wookie/trunk/src/org/apache/wookie/beans/AccessRequest.java
incubator/wookie/trunk/src/org/apache/wookie/beans/ActiveRecord.java
incubator/wookie/trunk/src/org/apache/wookie/beans/ApiKey.java
incubator/wookie/trunk/src/org/apache/wookie/beans/Description.java
incubator/wookie/trunk/src/org/apache/wookie/beans/Feature.java
incubator/wookie/trunk/src/org/apache/wookie/beans/License.java
incubator/wookie/trunk/src/org/apache/wookie/beans/Name.java
incubator/wookie/trunk/src/org/apache/wookie/beans/Param.java
incubator/wookie/trunk/src/org/apache/wookie/beans/Participant.java
incubator/wookie/trunk/src/org/apache/wookie/beans/Post.java
incubator/wookie/trunk/src/org/apache/wookie/beans/Preference.java
incubator/wookie/trunk/src/org/apache/wookie/beans/PreferenceDefault.java
incubator/wookie/trunk/src/org/apache/wookie/beans/ServerFeature.java
incubator/wookie/trunk/src/org/apache/wookie/beans/SharedData.java
incubator/wookie/trunk/src/org/apache/wookie/beans/StartFile.java
incubator/wookie/trunk/src/org/apache/wookie/beans/Token.java
incubator/wookie/trunk/src/org/apache/wookie/beans/Whitelist.java
incubator/wookie/trunk/src/org/apache/wookie/beans/Widget.java
incubator/wookie/trunk/src/org/apache/wookie/beans/WidgetDefault.java
incubator/wookie/trunk/src/org/apache/wookie/beans/WidgetIcon.java
incubator/wookie/trunk/src/org/apache/wookie/beans/WidgetInstance.java
incubator/wookie/trunk/src/org/apache/wookie/beans/WidgetService.java
incubator/wookie/trunk/src/org/apache/wookie/beans/WidgetType.java
incubator/wookie/trunk/src/org/apache/wookie/beans/schema.hbm.xml
incubator/wookie/trunk/src/org/apache/wookie/util/hibernate/
Modified:
incubator/wookie/trunk/.classpath
incubator/wookie/trunk/WebContent/WEB-INF/dwr.xml
incubator/wookie/trunk/WebContent/WEB-INF/web.xml
incubator/wookie/trunk/WebContent/admin/addnewservice.jsp
incubator/wookie/trunk/WebContent/admin/addtowhitelist.jsp
incubator/wookie/trunk/WebContent/admin/index.jsp
incubator/wookie/trunk/WebContent/admin/keys.jsp
incubator/wookie/trunk/WebContent/admin/listall.jsp
incubator/wookie/trunk/WebContent/admin/listallfordelete.jsp
incubator/wookie/trunk/WebContent/admin/listservices.jsp
incubator/wookie/trunk/WebContent/admin/message.jsp
incubator/wookie/trunk/WebContent/admin/removeservice.jsp
incubator/wookie/trunk/WebContent/admin/removewhitelist.jsp
incubator/wookie/trunk/WebContent/admin/uploadresults.jsp
incubator/wookie/trunk/WebContent/admin/viewwhitelist.jsp
incubator/wookie/trunk/WebContent/deploy/ (props changed)
incubator/wookie/trunk/WebContent/webmenu/demoWidget.jsp
incubator/wookie/trunk/WebContent/webmenu/index.jsp
incubator/wookie/trunk/WebContent/webmenu/instantiate.jsp
incubator/wookie/trunk/WebContent/webmenu/listall.jsp
incubator/wookie/trunk/WebContent/webmenu/requestapikey.jsp
incubator/wookie/trunk/WebContent/wservices/notsupported/ (props changed)
incubator/wookie/trunk/WebContent/wservices/notsupported/index.htm (props changed)
incubator/wookie/trunk/WebContent/wservices/notsupported/locales/ (props changed)
incubator/wookie/trunk/WebContent/wservices/notsupported/locales/bu/ (props changed)
incubator/wookie/trunk/WebContent/wservices/notsupported/locales/bu/index.htm (props changed)
incubator/wookie/trunk/WebContent/wservices/notsupported/locales/en/ (props changed)
incubator/wookie/trunk/WebContent/wservices/notsupported/locales/en/index.htm (props changed)
incubator/wookie/trunk/WebContent/wservices/notsupported/locales/fr/ (props changed)
incubator/wookie/trunk/WebContent/wservices/notsupported/locales/fr/index.htm (props changed)
incubator/wookie/trunk/ant/ivy-java-common.xml
incubator/wookie/trunk/ant/ivy-webapp-common.xml
incubator/wookie/trunk/build.properties
incubator/wookie/trunk/build.xml
incubator/wookie/trunk/features/ (props changed)
incubator/wookie/trunk/features/build.xml (props changed)
incubator/wookie/trunk/features/camera/ (props changed)
incubator/wookie/trunk/features/camera/build.xml (props changed)
incubator/wookie/trunk/features/camera/licenses.txt (props changed)
incubator/wookie/trunk/features/camera/shared/ (props changed)
incubator/wookie/trunk/features/camera/shared/bondi_camera.js (props changed)
incubator/wookie/trunk/features/camera/shared/camcanvas.html (props changed)
incubator/wookie/trunk/features/camera/shared/camcanvas.swf (props changed)
incubator/wookie/trunk/features/camera/shared/jquery.js (props changed)
incubator/wookie/trunk/features/camera/shared/loadingAnimation.gif (props changed)
incubator/wookie/trunk/features/camera/shared/snap.png (props changed)
incubator/wookie/trunk/features/camera/shared/thickbox.css (props changed)
incubator/wookie/trunk/features/camera/shared/thickbox.js (props changed)
incubator/wookie/trunk/features/camera/src/ (props changed)
incubator/wookie/trunk/features/camera/src/org/ (props changed)
incubator/wookie/trunk/features/camera/src/org/apache/ (props changed)
incubator/wookie/trunk/features/camera/src/org/apache/wookie/ (props changed)
incubator/wookie/trunk/features/camera/src/org/apache/wookie/feature/ (props changed)
incubator/wookie/trunk/features/camera/src/org/apache/wookie/feature/bondi/ (props changed)
incubator/wookie/trunk/features/camera/src/org/apache/wookie/feature/bondi/camera/ (props changed)
incubator/wookie/trunk/features/camera/src/org/apache/wookie/feature/bondi/camera/CameraFeature.java (props changed)
incubator/wookie/trunk/ivy.xml
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/LocalizationUtils.java
incubator/wookie/trunk/readme.txt
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/AccessRequestTest.java
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/FeatureLoaderTest.java
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/OpenSocialUtilsTest.java
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/ (props changed)
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java (props changed)
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/WidgetInterface.java (props changed)
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/integration/GadgetUtilsTest.java
incubator/wookie/trunk/src/log4j.properties
incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
incubator/wookie/trunk/src/org/apache/wookie/WidgetWebMenuServlet.java
incubator/wookie/trunk/src/org/apache/wookie/ajaxmodel/IWidgetAPI.java
incubator/wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/WidgetAPIImpl.java
incubator/wookie/trunk/src/org/apache/wookie/controller/ParticipantsController.java
incubator/wookie/trunk/src/org/apache/wookie/controller/PropertiesController.java
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetAccessRequestPolicyController.java
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetServicesController.java
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java
incubator/wookie/trunk/src/org/apache/wookie/feature/FeatureLoader.java
incubator/wookie/trunk/src/org/apache/wookie/feature/conformance/ (props changed)
incubator/wookie/trunk/src/org/apache/wookie/feature/conformance/Test.java (props changed)
incubator/wookie/trunk/src/org/apache/wookie/feature/wave/WaveAPIImpl.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/AccessRequestHelper.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/FlashMessage.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/Notifier.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/ParticipantHelper.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceHelper.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetKeyManager.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetServiceHelper.java
incubator/wookie/trunk/src/org/apache/wookie/manager/IWidgetAdminManager.java
incubator/wookie/trunk/src/org/apache/wookie/manager/impl/WidgetAdminManager.java
incubator/wookie/trunk/src/org/apache/wookie/proxy/ProxyServlet.java
incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java
incubator/wookie/trunk/src/org/apache/wookie/server/LocalizedResourceFilter.java
incubator/wookie/trunk/src/org/apache/wookie/server/MainFilter.java
incubator/wookie/trunk/src/org/apache/wookie/server/Start.java
incubator/wookie/trunk/src/org/apache/wookie/util/SiblingPageNormalizer.java
incubator/wookie/trunk/src/org/apache/wookie/util/html/ (props changed)
incubator/wookie/trunk/src/org/apache/wookie/util/html/HtmlCleaner.java (props changed)
incubator/wookie/trunk/src/org/apache/wookie/util/html/HtmlSerializer.java (props changed)
incubator/wookie/trunk/src/org/apache/wookie/util/html/IHtmlProcessor.java (props changed)
incubator/wookie/trunk/src/org/apache/wookie/util/html/StartPageProcessor.java (contents, props changed)
incubator/wookie/trunk/src/org/apache/wookie/util/opensocial/OpenSocialUtils.java
incubator/wookie/trunk/src/org/apache/wookie/widgets/forum/IForumManager.java
incubator/wookie/trunk/src/org/apache/wookie/widgets/forum/PostNode.java
incubator/wookie/trunk/src/org/apache/wookie/widgets/forum/impl/DefaultForumServiceImpl.java
incubator/wookie/trunk/src/org/apache/wookie/widgets/forum/impl/ForumManager.java
incubator/wookie/trunk/src/widgetserver.properties
incubator/wookie/trunk/widgets/ (props changed)
incubator/wookie/trunk/widgets/bubbles/ (props changed)
incubator/wookie/trunk/widgets/bubbles/build.xml (props changed)
incubator/wookie/trunk/widgets/bubbles/config.xml (props changed)
incubator/wookie/trunk/widgets/bubbles/fail.png (props changed)
incubator/wookie/trunk/widgets/bubbles/hud.bg.png (props changed)
incubator/wookie/trunk/widgets/bubbles/icon_42.png (props changed)
incubator/wookie/trunk/widgets/bubbles/icon_64.png (props changed)
incubator/wookie/trunk/widgets/bubbles/index.html (props changed)
incubator/wookie/trunk/widgets/bubbles/licence.txt (props changed)
incubator/wookie/trunk/widgets/bubbles/script.js (props changed)
incubator/wookie/trunk/widgets/bubbles/sprite.png (props changed)
incubator/wookie/trunk/widgets/bubbles/styles.css (props changed)
incubator/wookie/trunk/widgets/bubbles/win.png (props changed)
incubator/wookie/trunk/widgets/build/ (props changed)
incubator/wookie/trunk/widgets/butterfly/ (props changed)
incubator/wookie/trunk/widgets/butterfly/build.xml (props changed)
incubator/wookie/trunk/widgets/butterfly/config.xml (props changed)
incubator/wookie/trunk/widgets/butterfly/images/ (props changed)
incubator/wookie/trunk/widgets/butterfly/images/background.jpg (props changed)
incubator/wookie/trunk/widgets/butterfly/images/icon.png (props changed)
incubator/wookie/trunk/widgets/butterfly/images/splat.png (props changed)
incubator/wookie/trunk/widgets/butterfly/index.html (props changed)
incubator/wookie/trunk/widgets/butterfly/legal/ (props changed)
incubator/wookie/trunk/widgets/butterfly/legal/license.txt (props changed)
incubator/wookie/trunk/widgets/butterfly/lib/ (props changed)
incubator/wookie/trunk/widgets/butterfly/scripts/ (props changed)
incubator/wookie/trunk/widgets/butterfly/scripts/butterfly.js (props changed)
incubator/wookie/trunk/widgets/butterfly/style/ (props changed)
incubator/wookie/trunk/widgets/camera/ (props changed)
incubator/wookie/trunk/widgets/camera/build.xml (props changed)
incubator/wookie/trunk/widgets/camera/config.xml (props changed)
incubator/wookie/trunk/widgets/camera/icon.svg (props changed)
incubator/wookie/trunk/widgets/camera/index.html (props changed)
incubator/wookie/trunk/widgets/chat/ (props changed)
incubator/wookie/trunk/widgets/chat/build.xml (props changed)
incubator/wookie/trunk/widgets/chat/chat.css (props changed)
incubator/wookie/trunk/widgets/chat/chat.js (props changed)
incubator/wookie/trunk/widgets/chat/config.xml (props changed)
incubator/wookie/trunk/widgets/chat/index.htm (props changed)
incubator/wookie/trunk/widgets/chat/languageHelper.js (props changed)
incubator/wookie/trunk/widgets/chat/locales/ (props changed)
incubator/wookie/trunk/widgets/chat/locales/bu/ (props changed)
incubator/wookie/trunk/widgets/chat/locales/bu/localizedStrings.js (props changed)
incubator/wookie/trunk/widgets/chat/locales/en/ (props changed)
incubator/wookie/trunk/widgets/chat/locales/en/localizedStrings.js (props changed)
incubator/wookie/trunk/widgets/chat/widgetUtils.js (props changed)
incubator/wookie/trunk/widgets/forum/ (props changed)
incubator/wookie/trunk/widgets/forum/build.xml (props changed)
incubator/wookie/trunk/widgets/forum/config.xml (props changed)
incubator/wookie/trunk/widgets/forum/forum.css (props changed)
incubator/wookie/trunk/widgets/forum/forumutils.js (props changed)
incubator/wookie/trunk/widgets/forum/index.htm (props changed)
incubator/wookie/trunk/widgets/forum/languageHelper.js (props changed)
incubator/wookie/trunk/widgets/forum/locales/ (props changed)
incubator/wookie/trunk/widgets/forum/locales/bu/ (props changed)
incubator/wookie/trunk/widgets/forum/locales/bu/localizedStrings.js (props changed)
incubator/wookie/trunk/widgets/forum/locales/en/ (props changed)
incubator/wookie/trunk/widgets/forum/locales/en/localizedStrings.js (props changed)
incubator/wookie/trunk/widgets/forum/transparent.gif (props changed)
incubator/wookie/trunk/widgets/forum/widgetUtils.js (props changed)
incubator/wookie/trunk/widgets/localetest/ (props changed)
incubator/wookie/trunk/widgets/localetest/Images/ (props changed)
incubator/wookie/trunk/widgets/localetest/Images/test.png (props changed)
incubator/wookie/trunk/widgets/localetest/build.xml (props changed)
incubator/wookie/trunk/widgets/localetest/config.xml (props changed)
incubator/wookie/trunk/widgets/localetest/index.htm (props changed)
incubator/wookie/trunk/widgets/localetest/locales/ (props changed)
incubator/wookie/trunk/widgets/localetest/locales/en/ (props changed)
incubator/wookie/trunk/widgets/localetest/locales/en-gb-yorks/ (props changed)
incubator/wookie/trunk/widgets/localetest/locales/en-gb-yorks/index.htm (props changed)
incubator/wookie/trunk/widgets/localetest/locales/en/index.htm (props changed)
incubator/wookie/trunk/widgets/localetest/locales/en/test.txt (props changed)
incubator/wookie/trunk/widgets/localetest/locales/fr/ (props changed)
incubator/wookie/trunk/widgets/localetest/locales/fr/Images/ (props changed)
incubator/wookie/trunk/widgets/localetest/locales/fr/Images/test.png (props changed)
incubator/wookie/trunk/widgets/localetest/locales/fr/index.htm (props changed)
incubator/wookie/trunk/widgets/localetest/locales/index.htm (props changed)
incubator/wookie/trunk/widgets/natter/ (props changed)
incubator/wookie/trunk/widgets/natter/Images/ (props changed)
incubator/wookie/trunk/widgets/natter/Images/bar.png (props changed)
incubator/wookie/trunk/widgets/natter/Images/bg-reverse.png (props changed)
incubator/wookie/trunk/widgets/natter/Images/bg.png (props changed)
incubator/wookie/trunk/widgets/natter/Images/default_thumbnail.png (props changed)
incubator/wookie/trunk/widgets/natter/Images/ibutton/ (props changed)
incubator/wookie/trunk/widgets/natter/Images/ibutton/black_i.png (props changed)
incubator/wookie/trunk/widgets/natter/Images/ibutton/black_rollie.png (props changed)
incubator/wookie/trunk/widgets/natter/Images/ibutton/white_i.png (props changed)
incubator/wookie/trunk/widgets/natter/Images/ibutton/white_rollie.png (props changed)
incubator/wookie/trunk/widgets/natter/Images/lock.png (props changed)
incubator/wookie/trunk/widgets/natter/Images/trash.png (props changed)
incubator/wookie/trunk/widgets/natter/build.xml (props changed)
incubator/wookie/trunk/widgets/natter/chat.css (props changed)
incubator/wookie/trunk/widgets/natter/chat.js (props changed)
incubator/wookie/trunk/widgets/natter/config.xml (props changed)
incubator/wookie/trunk/widgets/natter/icon.png (props changed)
incubator/wookie/trunk/widgets/natter/index.htm (props changed)
incubator/wookie/trunk/widgets/natter/jquery.js (props changed)
incubator/wookie/trunk/widgets/natter/locales/ (props changed)
incubator/wookie/trunk/widgets/natter/locales/bu/ (props changed)
incubator/wookie/trunk/widgets/natter/locales/bu/localizedStrings.js (props changed)
incubator/wookie/trunk/widgets/natter/locales/en/ (props changed)
incubator/wookie/trunk/widgets/natter/locales/en/localizedStrings.js (props changed)
incubator/wookie/trunk/widgets/natter/smileys/ (props changed)
incubator/wookie/trunk/widgets/natter/smileys.js (props changed)
incubator/wookie/trunk/widgets/natter/smileys/-_-'.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/2fingers.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/2love.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/Emoticons.plist (props changed)
incubator/wookie/trunk/widgets/natter/smileys/LOL.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/Mr Po.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/O_o.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/alien.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/ambivalent.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/angry.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/angry2.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/ass.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/baby.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/baby2.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/barbu.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/beer.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/beret.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/bigkiss.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/bigsmile.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/blushing.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/brokenheart.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/bye.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/cake.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/cell.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/chinois.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/clock.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/cocktail.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/coffee.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/cold.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/confused.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/cool.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/crazy.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/cry.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/crying.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/cyclop.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/devil.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/disgusted.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/embarrassed.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/ermm.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/excl.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/fear.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/finger.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/flower_wilt.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/food.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/footinmouth.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/frown.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/gaga.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/gasp.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/getlost.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/grimacing.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/grin.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/grin2.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/happy.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/heart.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/hot.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/ill.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/inlove.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/innocent.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/innocent2.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/insane.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/ironic.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/island.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/japonais.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/kiss.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/kiss2.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/kissheart.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/kleenex.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/laugh.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/laughing.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/laughingweak.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/laughwink.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/lightbulb.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/loveU.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/moneymouth.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/moon.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/movie.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/music.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/naughty.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/nerd.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/oops.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/party.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/perfid.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/pig.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/pinch.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/pirate.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/pizza.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/po content.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/policeman.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/present.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/question.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/rabbit.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/rain.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/rainbow.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/rasta.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/rose.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/santa.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/sarcastic.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/sars.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/sealed.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/shaun.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/sick.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/slant.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/sleep.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/smile.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/sorcerer.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/star.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/stuart.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/sun.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/thumbsdown.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/thumbsup.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/tongue.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/turned.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/unsure.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/very_cool.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/very_tired.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/very_tyred2.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/wOOt.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/wassat.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/weak.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/whistling.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/wink.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/wub.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/yuck.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/yum.png (props changed)
incubator/wookie/trunk/widgets/natter/smileys/zorro.png (props changed)
incubator/wookie/trunk/widgets/notsupported/ (props changed)
incubator/wookie/trunk/widgets/notsupported/build.xml (props changed)
incubator/wookie/trunk/widgets/notsupported/config.xml (props changed)
incubator/wookie/trunk/widgets/notsupported/index.htm (props changed)
incubator/wookie/trunk/widgets/notsupported/locales/ (props changed)
incubator/wookie/trunk/widgets/notsupported/locales/bu/ (props changed)
incubator/wookie/trunk/widgets/notsupported/locales/bu/index.htm (props changed)
incubator/wookie/trunk/widgets/notsupported/locales/en/ (props changed)
incubator/wookie/trunk/widgets/notsupported/locales/en/index.htm (props changed)
incubator/wookie/trunk/widgets/notsupported/locales/fr/ (props changed)
incubator/wookie/trunk/widgets/notsupported/locales/fr/index.htm (props changed)
incubator/wookie/trunk/widgets/sharedraw/ (props changed)
incubator/wookie/trunk/widgets/sharedraw/build.xml (props changed)
incubator/wookie/trunk/widgets/sharedraw/config.xml (props changed)
incubator/wookie/trunk/widgets/sharedraw/images/ (props changed)
incubator/wookie/trunk/widgets/sharedraw/images/icon.png (props changed)
incubator/wookie/trunk/widgets/sharedraw/index.html (props changed)
incubator/wookie/trunk/widgets/sharedraw/legal/ (props changed)
incubator/wookie/trunk/widgets/sharedraw/lib/ (props changed)
incubator/wookie/trunk/widgets/sharedraw/scripts/ (props changed)
incubator/wookie/trunk/widgets/sharedraw/scripts/draw.js (props changed)
incubator/wookie/trunk/widgets/sharedraw/scripts/sharedraw.js (props changed)
incubator/wookie/trunk/widgets/sharedraw/style/ (props changed)
incubator/wookie/trunk/widgets/sudoku/ (props changed)
incubator/wookie/trunk/widgets/sudoku/Sudoku.gif (props changed)
incubator/wookie/trunk/widgets/sudoku/build.xml (props changed)
incubator/wookie/trunk/widgets/sudoku/config.xml (props changed)
incubator/wookie/trunk/widgets/sudoku/icon.png (props changed)
incubator/wookie/trunk/widgets/sudoku/jquery.js (props changed)
incubator/wookie/trunk/widgets/sudoku/json.js (props changed)
incubator/wookie/trunk/widgets/sudoku/main.js (props changed)
incubator/wookie/trunk/widgets/sudoku/style.css (props changed)
incubator/wookie/trunk/widgets/sudoku/sudoku.html (props changed)
incubator/wookie/trunk/widgets/sudoku/sudoku.js (props changed)
incubator/wookie/trunk/widgets/test/ (props changed)
incubator/wookie/trunk/widgets/test/build.xml (props changed)
incubator/wookie/trunk/widgets/test/config.xml (props changed)
incubator/wookie/trunk/widgets/test/icon.png (props changed)
incubator/wookie/trunk/widgets/test/index.htm (props changed)
incubator/wookie/trunk/widgets/test/styles.css (props changed)
incubator/wookie/trunk/widgets/test/test.js (props changed)
incubator/wookie/trunk/widgets/todo/ (props changed)
incubator/wookie/trunk/widgets/todo/anon.png (props changed)
incubator/wookie/trunk/widgets/todo/build.xml (props changed)
incubator/wookie/trunk/widgets/todo/completed.png (props changed)
incubator/wookie/trunk/widgets/todo/config.xml (props changed)
incubator/wookie/trunk/widgets/todo/icon.png (props changed)
incubator/wookie/trunk/widgets/todo/index.html (props changed)
incubator/wookie/trunk/widgets/todo/json2.js (props changed)
incubator/wookie/trunk/widgets/todo/minus.png (props changed)
incubator/wookie/trunk/widgets/todo/noone.png (props changed)
incubator/wookie/trunk/widgets/todo/plus.png (props changed)
incubator/wookie/trunk/widgets/todo/todo.js (props changed)
incubator/wookie/trunk/widgets/todo/todo.png (props changed)
incubator/wookie/trunk/widgets/vote/ (props changed)
incubator/wookie/trunk/widgets/vote/build.xml (props changed)
incubator/wookie/trunk/widgets/vote/config.xml (props changed)
incubator/wookie/trunk/widgets/vote/index.htm (props changed)
incubator/wookie/trunk/widgets/vote/languageHelper.js (props changed)
incubator/wookie/trunk/widgets/vote/locales/ (props changed)
incubator/wookie/trunk/widgets/vote/locales/bu/ (props changed)
incubator/wookie/trunk/widgets/vote/locales/bu/localizedStrings.js (props changed)
incubator/wookie/trunk/widgets/vote/locales/en/ (props changed)
incubator/wookie/trunk/widgets/vote/locales/en/localizedStrings.js (props changed)
incubator/wookie/trunk/widgets/vote/vote.css (props changed)
incubator/wookie/trunk/widgets/vote/vote.js (props changed)
incubator/wookie/trunk/widgets/vote/widgetUtils.js (props changed)
incubator/wookie/trunk/widgets/weather/ (props changed)
incubator/wookie/trunk/widgets/weather/build.xml (props changed)
incubator/wookie/trunk/widgets/weather/config.xml (props changed)
incubator/wookie/trunk/widgets/weather/icon.png (props changed)
incubator/wookie/trunk/widgets/weather/images/ (props changed)
incubator/wookie/trunk/widgets/weather/images/background.png (props changed)
incubator/wookie/trunk/widgets/weather/images/cloudy.png (props changed)
incubator/wookie/trunk/widgets/weather/images/rainy.png (props changed)
incubator/wookie/trunk/widgets/weather/images/snowy.png (props changed)
incubator/wookie/trunk/widgets/weather/images/sunny.png (props changed)
incubator/wookie/trunk/widgets/weather/index.htm (props changed)
incubator/wookie/trunk/widgets/weather/weather.css (props changed)
incubator/wookie/trunk/widgets/weather/weather.js (props changed)
incubator/wookie/trunk/widgets/widget-template/ (props changed)
incubator/wookie/trunk/widgets/widget-template/build.xml (props changed)
incubator/wookie/trunk/widgets/widget-template/config.xml (props changed)
incubator/wookie/trunk/widgets/widget-template/images/ (props changed)
incubator/wookie/trunk/widgets/widget-template/images/icon.png (props changed)
incubator/wookie/trunk/widgets/widget-template/index.html (props changed)
incubator/wookie/trunk/widgets/widget-template/legal/ (props changed)
incubator/wookie/trunk/widgets/widget-template/lib/ (props changed)
incubator/wookie/trunk/widgets/wookiewiki/ (props changed)
incubator/wookie/trunk/widgets/wookiewiki/build.xml (props changed)
incubator/wookie/trunk/widgets/wookiewiki/config.xml (props changed)
incubator/wookie/trunk/widgets/wookiewiki/creole.js (props changed)
incubator/wookie/trunk/widgets/wookiewiki/icon.png (props changed)
incubator/wookie/trunk/widgets/wookiewiki/index.html (props changed)
incubator/wookie/trunk/widgets/wookiewiki/styles.css (props changed)
incubator/wookie/trunk/widgets/wookiewiki/wiki.js (props changed)
incubator/wookie/trunk/widgets/youdecide/ (props changed)
incubator/wookie/trunk/widgets/youdecide/bg.png (props changed)
incubator/wookie/trunk/widgets/youdecide/bg.psd (props changed)
incubator/wookie/trunk/widgets/youdecide/build.xml (props changed)
incubator/wookie/trunk/widgets/youdecide/config.xml (props changed)
incubator/wookie/trunk/widgets/youdecide/icon.png (props changed)
incubator/wookie/trunk/widgets/youdecide/icon.psd (props changed)
incubator/wookie/trunk/widgets/youdecide/index.html (props changed)
incubator/wookie/trunk/widgets/youdecide/lock.png (props changed)
incubator/wookie/trunk/widgets/youdecide/reset.png (props changed)
incubator/wookie/trunk/widgets/youdecide/unlocked.png (props changed)
incubator/wookie/trunk/widgets/youdecide/vote.css (props changed)
incubator/wookie/trunk/widgets/youdecide/vote.js (props changed)
incubator/wookie/trunk/widgets/youdecide/vote.png (props changed)
Modified: incubator/wookie/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/.classpath?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/.classpath (original)
+++ incubator/wookie/trunk/.classpath Mon Aug 23 09:46:30 2010
@@ -2,11 +2,18 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-tests"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=project%3A%2F%2F%2Fant%2Fivysettings.xml&loadSettingsOnDemand=false&propertyFiles="/>
- <classpathentry kind="lib" path="ant/lib/htmlcleaner-2.1.0.jar"/>
- <classpathentry kind="lib" path="ant/lib/shindig-common-1.1-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="ant/lib/dwr-2.0.5.jar"/>
- <classpathentry kind="lib" path="ant/lib/commons-compress-1.0.jar"/>
+ <classpathentry kind="src" path="features/camera/src"/>
+ <classpathentry kind="src" output="parser/java/bin" path="parser/java/src"/>
+ <classpathentry kind="src" output="parser/java/bin" path="parser/java/src-test"/>
+ <classpathentry kind="src" path="connector/java/src"/>
+ <classpathentry exported="true" kind="lib" path="ant/lib/htmlcleaner-2.1.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="ant/lib/dwr-2.0.5.jar"/>
+ <classpathentry exported="true" kind="lib" path="ant/lib/commons-compress-1.0.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6"/>
+ <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&confs=*"/>
+ <classpathentry kind="lib" path="ant/lib/guice-2.0.jar"/>
+ <classpathentry kind="lib" path="ant/lib/icu4j-4_2_1.jar"/>
+ <classpathentry kind="lib" path="ant/lib/oauth-20090531.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: incubator/wookie/trunk/WebContent/WEB-INF/dwr.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/WEB-INF/dwr.xml?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/WEB-INF/dwr.xml (original)
+++ incubator/wookie/trunk/WebContent/WEB-INF/dwr.xml Mon Aug 23 09:46:30 2010
@@ -27,7 +27,7 @@
<include method="getViewer"/>
</create>
- <convert converter="object" match="org.apache.wookie.beans.Preference" javascript="Preference">
+ <convert converter="object" match="org.apache.wookie.ajaxmodel.impl.PreferenceDelegate" javascript="Preference">
<param name="force" value="true"/>
<param name="include" value="dkey, dvalue, readOnly"/>
</convert>
Modified: incubator/wookie/trunk/WebContent/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/WEB-INF/web.xml?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/WEB-INF/web.xml (original)
+++ incubator/wookie/trunk/WebContent/WEB-INF/web.xml Mon Aug 23 09:46:30 2010
@@ -23,9 +23,9 @@
<display-name>Wookie Widget Server</display-name>
<resource-ref>
- <description>The database connection.</description>
- <res-ref-name>jdbc/widgetdb</res-ref-name>
- <res-type>com.mchange.v2.c3p0.ComboPooledDataSource</res-type>
+ <description>@RESOURCE_REF_DESCRIPTION@</description>
+ <res-ref-name>@RESOURCE_REF_NAME@</res-ref-name>
+ <res-type>@RESOURCE_REF_TYPE@</res-type>
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
Modified: incubator/wookie/trunk/WebContent/admin/addnewservice.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/addnewservice.jsp?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/addnewservice.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/addnewservice.jsp Mon Aug 23 09:46:30 2010
@@ -14,8 +14,9 @@
* limitations under the License.
*/
--%>
-<%@ page import='org.apache.wookie.beans.WidgetService' %>
-<%WidgetService[] services = (WidgetService[])session.getAttribute("services"); %>
+<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
+<%@ page import='org.apache.wookie.beans.IWidgetService' %>
+<%IWidgetService[] services = (IWidgetService[])request.getAttribute("services"); %>
<html>
<head>
<title>Widget Service Types</title>
@@ -102,8 +103,8 @@ function doDialog(){
<div id="content">
- <% String errors = (String)session.getAttribute("error_value");%>
- <% String messages = (String)session.getAttribute("message_value");%>
+ <% String errors = FlashMessage.getErrors(session, request);%>
+ <% String messages = FlashMessage.getMessages(session, request);%>
<%if(errors!=null){%>
<p><img src="../shared/images/cancel.gif" width="16" height="16"><font color=red> <%=errors%> </font> </p>
<%}%>
@@ -133,7 +134,7 @@ function doDialog(){
<tr class="ui-widget-header"><td> Existing service types</td></tr>
- <%for (int i=1; i<services.length; i++){%>
+ <%for (int i=0; i<services.length; i++) if (!services[i].getServiceName().equals("unsupported")) {%>
<tr><td width="100%">
<div id="nifty">
<b class="rtop">
@@ -164,5 +165,4 @@ function doDialog(){
<div id="confirm" style="display:none;" title="Warning"></div>
</body>
</html>
-<% session.setAttribute("error_value", null); %>
-<% session.setAttribute("message_value", null);%>
\ No newline at end of file
+<% FlashMessage.clearErrorsAndMessages(session);%>
Modified: incubator/wookie/trunk/WebContent/admin/addtowhitelist.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/addtowhitelist.jsp?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/addtowhitelist.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/addtowhitelist.jsp Mon Aug 23 09:46:30 2010
@@ -14,8 +14,9 @@
* limitations under the License.
*/
--%>
-<%@ page import='org.apache.wookie.beans.Whitelist' %>
-<%Whitelist[] services = (Whitelist[])session.getAttribute("whitelist"); %>
+<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
+<%@ page import='org.apache.wookie.beans.IWhitelist' %>
+<%IWhitelist[] services = (IWhitelist[])request.getAttribute("whitelist"); %>
<html>
<head>
<title>Add a new White list entry</title>
@@ -100,8 +101,8 @@ function doDialog(){
<div id="content">
- <% String errors = (String)session.getAttribute("error_value");%>
- <% String messages = (String)session.getAttribute("message_value");%>
+ <% String errors = FlashMessage.getErrors(session, request);%>
+ <% String messages = FlashMessage.getMessages(session, request);%>
<%if(errors!=null){%>
<p><img src="../shared/images/cancel.gif" width="16" height="16"><font color=red> <%=errors%> </font> </p>
<%}%>
@@ -128,7 +129,7 @@ function doDialog(){
<br>
<table width="500" class="ui-widget ui-widget-content" align="center">
<tr class="ui-widget-header"><td> Existing entries</td></tr>
- <%for (int i=2; i<services.length; i++){%>
+ <%for (int i=0; i<services.length; i++) if (!services[i].getfUrl().equals("http://localhost") && !services[i].getfUrl().equals("http://127.0.0.1")) {%>
<tr><td width="100%">
<div id="nifty">
<b class="rtop">
@@ -157,5 +158,4 @@ function doDialog(){
<div id="confirm" style="display:none;" title="Warning"></div>
</body>
</html>
-<% session.setAttribute("error_value", null); %>
-<% session.setAttribute("message_value", null); %>
\ No newline at end of file
+<% FlashMessage.clearErrorsAndMessages(session);%>
Modified: incubator/wookie/trunk/WebContent/admin/index.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/index.jsp?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/index.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/index.jsp Mon Aug 23 09:46:30 2010
@@ -14,15 +14,15 @@
* limitations under the License.
*/
--%>
-<% String version = (String)session.getAttribute("version");
+<% String version = (String)request.getAttribute("version");
if (version == null){
version="";
}
%>
<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
<% FlashMessage.getInstance().appendFlashMessages(session);%>
-<% String errors = (String)session.getAttribute("error_value");%>
-<% String messages = (String)session.getAttribute("message_value");%>
+<% String errors = FlashMessage.getErrors(session, request);%>
+<% String messages = FlashMessage.getMessages(session, request);%>
<html>
<head>
<title>Widget Server Administration <%=version%></title>
@@ -310,6 +310,4 @@ if (version == null){
</body>
</html>
-<% session.setAttribute("error_value", null); %>
-<% session.setAttribute("message_value", null);%>
-
+<% FlashMessage.clearErrorsAndMessages(session);%>
Modified: incubator/wookie/trunk/WebContent/admin/keys.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/keys.jsp?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/keys.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/keys.jsp Mon Aug 23 09:46:30 2010
@@ -13,8 +13,9 @@
* limitations under the License.
*/
--%>
-<%@ page import='org.apache.wookie.beans.ApiKey' %>
-<% ApiKey[] keys = (ApiKey[])session.getAttribute("keys"); %>
+<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
+<%@ page import='org.apache.wookie.beans.IApiKey' %>
+<% IApiKey[] keys = (IApiKey[])request.getAttribute("keys"); %>
<html>
<head>
<title>Widget Service Types</title>
@@ -33,8 +34,8 @@
<tr>
<td valign="top" bgcolor="#FFFFFF" class="tbody">
<h3>API Keys</h3>
- <% String errors = (String)session.getAttribute("error_value");%>
- <% String messages = (String)session.getAttribute("message_value");%>
+ <% String errors = FlashMessage.getErrors(session, request);%>
+ <% String messages = FlashMessage.getMessages(session, request);%>
<%if(errors!=null){%>
<p><img src="../shared/images/cancel.gif" width="16" height="16"><font color=red> <%=errors%> </font> </p>
<%}%>
@@ -69,5 +70,4 @@
</body>
</html>
-<% session.setAttribute("error_value", null); %>
-<% session.setAttribute("message_value", null);%>
\ No newline at end of file
+<% FlashMessage.clearErrorsAndMessages(session);%>
Modified: incubator/wookie/trunk/WebContent/admin/listall.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/listall.jsp?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/listall.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/listall.jsp Mon Aug 23 09:46:30 2010
@@ -14,10 +14,11 @@
* limitations under the License.
*/
--%>
-<%@ page import='org.apache.wookie.beans.Widget,org.apache.wookie.beans.WidgetType,java.util.Set,java.util.Hashtable;' %>
+<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
+<%@ page import='org.apache.wookie.beans.IWidget,org.apache.wookie.beans.IWidgetType,java.util.Collection,java.util.Hashtable;' %>
<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
-<% String errors = (String)session.getAttribute("error_value");%>
-<% String messages = (String)session.getAttribute("message_value");%>
+<% String errors = FlashMessage.getErrors(session, request);%>
+<% String messages = FlashMessage.getMessages(session, request);%>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -133,11 +134,11 @@ var answer = confirm("Are you sure you w
<div id="accordion">
<%
- Widget[] widgets = (Widget[])session.getAttribute("widgets");
- Hashtable widgetHashDefaults = (Hashtable)session.getAttribute("widget_defaults");
+ IWidget[] widgets = (IWidget[])request.getAttribute("widgets");
+ Hashtable widgetHashDefaults = (Hashtable)request.getAttribute("widget_defaults");
if(widgets!=null){
for (int i = 1; i < widgets.length; i++) {
- Widget widget = (Widget) widgets[i];
+ IWidget widget = (IWidget) widgets[i];
%>
<h3><a href="#"><img height="20" width="20" border="0" src="<%=widget.getWidgetIconLocation()%>"/> <%=widget.getWidgetTitle()%></a></h3>
@@ -254,8 +255,8 @@ var answer = confirm("Are you sure you w
</b>
<div><div style="float:left;" class="adminLayerTitle">Types</div><div class="adminLayerDetail">
<%
- Set<WidgetType> types = widget.getWidgetTypes();
- WidgetType[] widgetTypes = types.toArray(new WidgetType[types.size()]);
+ Collection<IWidgetType> types = widget.getWidgetTypes();
+ IWidgetType[] widgetTypes = types.toArray(new IWidgetType[types.size()]);
for(int j=0;j<widgetTypes.length;++j){
if(j!=0){
%> <%
@@ -300,7 +301,4 @@ var answer = confirm("Are you sure you w
<div id="confirm" style="display:none;" title="Warning"></div>
</body>
</html>
-<% session.setAttribute("error_value", null); %>
-<% session.setAttribute("message_value", null);%>
-<% session.setAttribute("widget_defaults", null);%>
-<% session.setAttribute("widgets", null);%>
\ No newline at end of file
+<% FlashMessage.clearErrorsAndMessages(session);%>
Modified: incubator/wookie/trunk/WebContent/admin/listallfordelete.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/listallfordelete.jsp?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/listallfordelete.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/listallfordelete.jsp Mon Aug 23 09:46:30 2010
@@ -13,7 +13,8 @@
* limitations under the License.
*/
--%>
-<%@ page import='org.apache.wookie.beans.Widget,org.apache.wookie.beans.WidgetType,java.util.Set,java.util.Hashtable;' %>
+<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
+<%@ page import='org.apache.wookie.beans.IWidget,org.apache.wookie.beans.IWidgetType;' %>
<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
<!DOCTYPE html>
<html>
@@ -79,8 +80,8 @@ $(document).ready(function(){
<div id="content">
- <% String errors = (String)session.getAttribute("error_value");%>
- <% String messages = (String)session.getAttribute("message_value");%>
+ <% String errors = FlashMessage.getErrors(session, request);%>
+ <% String messages = FlashMessage.getMessages(session, request);%>
<%if(errors!=null){%>
<p><img src="../shared/images/cancel.gif" width="16" height="16"><font color=red> <%=errors%> </font> </p>
<%}%>
@@ -92,12 +93,12 @@ $(document).ready(function(){
</p>
<%}%>
<%
- Widget[] widgets = (Widget[])session.getAttribute("widgets");
+ IWidget[] widgets = (IWidget[])request.getAttribute("widgets");
if(widgets!=null){
%>
<%
for (int i = 1; i < widgets.length; i++) {
- Widget widget = (Widget) widgets[i];
+ IWidget widget = (IWidget) widgets[i];
%>
<table width="500" class="ui-widget ui-widget-content" align="center">
<tr class="ui-widget-header"><td colspan="2"><img height="16" width="16" border="0" src="<%=widget.getWidgetIconLocation()%>"/> <%=widget.getWidgetTitle()%></td></tr>
@@ -124,5 +125,4 @@ $(document).ready(function(){
<div id="confirm" style="display:none;" title="Delete widget"></div>
</body>
</html>
-<% session.setAttribute("error_value", null); %>
-<% session.setAttribute("message_value", null);%>
\ No newline at end of file
+<% FlashMessage.clearErrorsAndMessages(session);%>
Modified: incubator/wookie/trunk/WebContent/admin/listservices.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/listservices.jsp?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/listservices.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/listservices.jsp Mon Aug 23 09:46:30 2010
@@ -14,8 +14,9 @@
* limitations under the License.
*/
--%>
-<%@ page import='org.apache.wookie.beans.WidgetService' %>
-<%WidgetService[] services = (WidgetService[])session.getAttribute("services"); %>
+<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
+<%@ page import='org.apache.wookie.beans.IWidgetService' %>
+<%IWidgetService[] services = (IWidgetService[])request.getAttribute("services"); %>
<html>
<head>
<title>Widget Service Types</title>
@@ -55,8 +56,8 @@ $(document).ready(function(){
<div id="content">
- <% String errors = (String)session.getAttribute("error_value");%>
- <% String messages = (String)session.getAttribute("message_value");%>
+ <% String errors = FlashMessage.getErrors(session, request);%>
+ <% String messages = FlashMessage.getMessages(session, request);%>
<%if(errors!=null){%>
<p><img src="../shared/images/cancel.gif" width="16" height="16"><font color=red> <%=errors%> </font> </p>
<%}%>
@@ -76,7 +77,7 @@ $(document).ready(function(){
<table width="500" class="ui-widget ui-widget-content" align="center">
<tr class="ui-widget-header"><td> Existing service types</td></tr>
- <%for (int i=1; i<services.length; i++){%>
+ <%for (int i=0; i<services.length; i++) if (!services[i].getServiceName().equals("unsupported")) {%>
<tr><td width="100%">
<div id="nifty">
@@ -111,5 +112,4 @@ $(document).ready(function(){
</body>
</html>
-<% session.setAttribute("error_value", null); %>
-<% session.setAttribute("message_value", null);%>
\ No newline at end of file
+<% FlashMessage.clearErrorsAndMessages(session);%>
Modified: incubator/wookie/trunk/WebContent/admin/message.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/message.jsp?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/message.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/message.jsp Mon Aug 23 09:46:30 2010
@@ -13,6 +13,7 @@
* limitations under the License.
*/
--%>
+<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
<html>
<head>
<title>Results</title>
@@ -33,9 +34,9 @@
<td valign="top" bgcolor="#FFFFFF" class="tbody">
<h3>Results</h3>
+<% String errors = FlashMessage.getErrors(session, request);%>
+<% String messages = FlashMessage.getMessages(session, request);%>
<%
-String errors = (String)session.getAttribute("error_value");
-String messages = (String)session.getAttribute("message_value");
if(errors!=null){%>
<font color=red>
<%=errors%>
@@ -56,5 +57,4 @@ if(messages!=null){%>
</body>
</html>
-<% session.setAttribute("error_value", null); %>
-<% session.setAttribute("message_value", null);%>
\ No newline at end of file
+<% FlashMessage.clearErrorsAndMessages(session);%>
Modified: incubator/wookie/trunk/WebContent/admin/removeservice.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/removeservice.jsp?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/removeservice.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/removeservice.jsp Mon Aug 23 09:46:30 2010
@@ -14,8 +14,9 @@
* limitations under the License.
*/
--%>
-<%@ page import='org.apache.wookie.beans.WidgetService' %>
-<%WidgetService[] services = (WidgetService[])session.getAttribute("services"); %>
+<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
+<%@ page import='org.apache.wookie.beans.IWidgetService' %>
+<%IWidgetService[] services = (IWidgetService[])request.getAttribute("services"); %>
<html>
<head>
<title>Remove Service Type</title>
@@ -78,8 +79,8 @@ $(document).ready(function(){
<div id="content">
- <% String errors = (String)session.getAttribute("error_value");%>
- <% String messages = (String)session.getAttribute("message_value");%>
+ <% String errors = FlashMessage.getErrors(session, request);%>
+ <% String messages = FlashMessage.getMessages(session, request);%>
<%if(errors!=null){%>
<p><img src="../shared/images/cancel.gif" width="16" height="16"><font color=red> <%=errors%> </font> </p>
<%}%>
@@ -95,7 +96,7 @@ $(document).ready(function(){
<table width="500" class="ui-widget ui-widget-content" align="center">
<tr class="ui-widget-header"><td colspan="2">Services</td></tr>
- <%for (int i=1; i<services.length; i++){%>
+ <%for (int i=0; i<services.length; i++) if (!services[i].getServiceName().equals("unsupported")) {%>
<tr><td>
<div id="nifty">
<b class="rtop">
@@ -145,5 +146,4 @@ $(document).ready(function(){
<div id="confirm" style="display:none;" title="Delete service"></div>
</body>
</html>
-<% session.setAttribute("error_value", null); %>
-<% session.setAttribute("message_value", null);%>
\ No newline at end of file
+<% FlashMessage.clearErrorsAndMessages(session);%>
Modified: incubator/wookie/trunk/WebContent/admin/removewhitelist.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/removewhitelist.jsp?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/removewhitelist.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/removewhitelist.jsp Mon Aug 23 09:46:30 2010
@@ -1,5 +1,6 @@
-<%@ page import='org.apache.wookie.beans.Whitelist' %>
-<%Whitelist[] list = (Whitelist[])session.getAttribute("whitelist"); %>
+<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
+<%@ page import='org.apache.wookie.beans.IWhitelist' %>
+<%IWhitelist[] list = (IWhitelist[])request.getAttribute("whitelist"); %>
<!DOCTYPE html>
<%--
/*
@@ -86,8 +87,8 @@ var answer = confirm("Are you sure you w
<div id="content">
- <% String errors = (String)session.getAttribute("error_value");%>
- <% String messages = (String)session.getAttribute("message_value");%>
+ <% String errors = FlashMessage.getErrors(session, request);%>
+ <% String messages = FlashMessage.getMessages(session, request);%>
<%if(errors!=null){%>
<p><img src="../shared/images/cancel.gif" width="16" height="16"><font color="red"> <%=errors%> </font> </p>
<%}%>
@@ -103,7 +104,7 @@ var answer = confirm("Are you sure you w
<table width="500" class="ui-widget ui-widget-content" align="center">
<tr class="ui-widget-header"><td colspan="2">Existing entries</td></tr>
- <%for (int i=2; i<list.length; i++){%>
+ <%for (int i=0; i<list.length; i++) if (!list[i].getfUrl().equals("http://localhost") && !list[i].getfUrl().equals("http://127.0.0.1")) {%>
<tr><td>
<div id="nifty">
<b class="rtop">
@@ -155,5 +156,4 @@ var answer = confirm("Are you sure you w
</html>
</body>
</html>
-<% session.setAttribute("error_value", null); %>
-<% session.setAttribute("message_value", null); %>
\ No newline at end of file
+<% FlashMessage.clearErrorsAndMessages(session);%>
Modified: incubator/wookie/trunk/WebContent/admin/uploadresults.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/uploadresults.jsp?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/uploadresults.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/uploadresults.jsp Mon Aug 23 09:46:30 2010
@@ -13,14 +13,15 @@
* limitations under the License.
*/
--%>
-<%@ page import='org.apache.wookie.beans.WidgetService' %>
+<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
+<%@ page import='org.apache.wookie.beans.IWidgetService' %>
+<% String errors = FlashMessage.getErrors(session, request);%>
+<% String messages = FlashMessage.getMessages(session, request);%>
<%
-Integer dbkey = (Integer)session.getAttribute("dbkey");
-String errors = (String)session.getAttribute("error_value");
-String messages = (String)session.getAttribute("message_value");
-Boolean hasValidated = (Boolean)session.getAttribute("hasValidated");
-Boolean closeWindow = (Boolean)session.getAttribute("closeWindow");
-WidgetService[] services = (WidgetService[])session.getAttribute("services");
+Integer dbkey = (Integer)request.getAttribute("dbkey");
+Boolean hasValidated = (Boolean)request.getAttribute("hasValidated");
+Boolean closeWindow = (Boolean)request.getAttribute("closeWindow");
+IWidgetService[] services = (IWidgetService[])request.getAttribute("services");
%>
<!DOCTYPE html>
<html>
@@ -108,5 +109,4 @@ When a client of the widget system asks
</body>
</html>
-<% session.setAttribute("error_value", null); %>
-<% session.setAttribute("message_value", null);%>
\ No newline at end of file
+<% FlashMessage.clearErrorsAndMessages(session);%>
Modified: incubator/wookie/trunk/WebContent/admin/viewwhitelist.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/viewwhitelist.jsp?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/viewwhitelist.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/viewwhitelist.jsp Mon Aug 23 09:46:30 2010
@@ -14,8 +14,9 @@
* limitations under the License.
*/
--%>
-<%@ page import='org.apache.wookie.beans.Whitelist' %>
-<%Whitelist[] services = (Whitelist[])session.getAttribute("whitelist"); %>
+<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
+<%@ page import='org.apache.wookie.beans.IWhitelist' %>
+<%IWhitelist[] services = (IWhitelist[])request.getAttribute("whitelist"); %>
<html>
<head>
<title>Server white list</title>
@@ -41,8 +42,8 @@
<div id="content">
- <% String errors = (String)session.getAttribute("error_value");%>
- <% String messages = (String)session.getAttribute("message_value");%>
+ <% String errors = FlashMessage.getErrors(session, request);%>
+ <% String messages = FlashMessage.getMessages(session, request);%>
<%if(errors!=null){%>
<p><img src="../shared/images/cancel.gif" width="16" height="16"><font color=red> <%=errors%> </font> </p>
<%}%>
@@ -58,7 +59,7 @@
<table width="500" class="ui-widget ui-widget-content" align="center">
<tr class="ui-widget-header"><td> Existing entries</td></tr>
- <%for (int i=2; i<services.length; i++){%>
+ <%for (int i=0; i<services.length; i++) if (!services[i].getfUrl().equals("http://localhost") && !services[i].getfUrl().equals("http://127.0.0.1")) {%>
<tr><td width="100%">
<div id="nifty">
<b class="rtop">
@@ -87,5 +88,4 @@
</body>
</html>
-<% session.setAttribute("error_value", null); %>
-<% session.setAttribute("message_value", null); %>
\ No newline at end of file
+<% FlashMessage.clearErrorsAndMessages(session);%>
Propchange: incubator/wookie/trunk/WebContent/deploy/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Aug 23 09:46:30 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/pluggablepersistence/WebContent/deploy:948461-988031*
+/incubator/wookie/branches/standalone/WebContent/deploy:827972-831908
Modified: incubator/wookie/trunk/WebContent/webmenu/demoWidget.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/webmenu/demoWidget.jsp?rev=988048&r1=988047&r2=988048&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/webmenu/demoWidget.jsp (original)
+++ incubator/wookie/trunk/WebContent/webmenu/demoWidget.jsp Mon Aug 23 09:46:30 2010
@@ -13,8 +13,9 @@
* limitations under the License.
*/
--%>
+<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
<%@ page
- import='org.apache.wookie.Messages,org.apache.wookie.beans.Widget,org.apache.wookie.beans.WidgetType,java.util.ArrayList,java.util.Set,java.util.Enumeration,java.util.Hashtable;'%>
+ import='org.apache.wookie.Messages'%>
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<%
@@ -81,10 +82,4 @@
</div>
</body>
</html>
-<%
- session.setAttribute("error_value", null);
-%>
-<%
- session.setAttribute("message_value", null);
-%>
-
+<% FlashMessage.clearErrorsAndMessages(session);%>