You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2013/03/22 17:13:07 UTC
svn commit: r1459881 [2/8] - in /rave/trunk: ./ rave-components/
rave-components/rave-core-api/ rave-components/rave-core-api/src/
rave-components/rave-core-api/src/main/
rave-components/rave-core-api/src/main/java/
rave-components/rave-core-api/src/ma...
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageInvitationStatus.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageInvitationStatus.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageInvitationStatus.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageInvitationStatus.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageInvitationStatus.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageInvitationStatus.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageInvitationStatus.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import java.util.HashMap;
import java.util.Map;
Propchange: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageInvitationStatus.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageLayout.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageLayout.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageLayout.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageLayout.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageLayout.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageLayout.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageLayout.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageTemplate.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageTemplate.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageTemplate.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageTemplate.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
import java.util.List;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageTemplateRegion.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageTemplateRegion.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageTemplateRegion.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageTemplateRegion.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
import java.util.List;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageTemplateWidget.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageTemplateWidget.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageTemplateWidget.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageTemplateWidget.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageType.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageType.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageType.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageType.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageType.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageType.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageType.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import java.util.HashMap;
import java.util.Map;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageUser.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageUser.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageUser.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PageUser.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Person.java (from r1453622, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Person.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Person.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Person.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Person.java&r1=1453622&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Person.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Person.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
import java.util.List;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PersonProperty.java (from r1453622, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PersonProperty.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PersonProperty.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java&r1=1453622&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PersonProperty.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PortalPreference.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PortalPreference.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PortalPreference.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/PortalPreference.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
import java.util.List;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Region.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Region.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Region.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Region.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
import java.util.List;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/RegionWidget.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/RegionWidget.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/RegionWidget.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/RegionWidget.java Fri Mar 22 16:12:58 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import org.codehaus.jackson.annotate.JsonBackReference;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/RegionWidgetPreference.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/RegionWidgetPreference.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/RegionWidgetPreference.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/RegionWidgetPreference.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Tag.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Tag.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Tag.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Tag.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
import java.util.List;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/User.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/User.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/User.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/User.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Widget.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Widget.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Widget.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Widget.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlTransient;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetComment.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetComment.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetComment.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetComment.java Fri Mar 22 16:12:58 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
import java.util.Date;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetRating.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetRating.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetRating.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetRating.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetStatus.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetStatus.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetStatus.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetStatus.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetStatus.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetStatus.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetStatus.java Fri Mar 22 16:12:58 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import java.util.HashMap;
import java.util.Map;
Copied: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetTag.java (from r1458998, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetTag.java?p2=rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetTag.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java&r1=1458998&r2=1459881&rev=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/WidgetTag.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.model;
import javax.xml.bind.annotation.XmlTransient;
import java.util.Date;
Added: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PeopleResource.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PeopleResource.java?rev=1459881&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PeopleResource.java (added)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/PeopleResource.java Fri Mar 22 16:12:58 2013
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rave.rest;
+
+import org.apache.rave.model.FriendRequest;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Path("/people")
+public interface PeopleResource {
+
+ @GET
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public Response getPeople();
+
+ @GET
+ @Path("/{id}")
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public Response getPerson(@PathParam("id") String id);
+
+ @GET
+ @Path("/{id}/friends")
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public Response getFriends(@PathParam("id") String id);
+
+ @GET
+ @Path("/{id}/friends/{friendID}")
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public Response getFriend(@PathParam("id") String id, @PathParam("friendID") String friendID);
+
+ @DELETE
+ @Path("/{id}/friends/{friendID}")
+ public Response deleteFriend(@PathParam("id") String id, @PathParam("friendID") String friendID);
+
+ @GET
+ @Path("/{id}/requests")
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public Response getRequests(@PathParam("id") String id);
+
+ @POST
+ @Path("/{id}/requests")
+ @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public Response createRequest(@PathParam("id") String id, FriendRequest request);
+
+ @GET
+ @Path("/{id}/requests/{id}")
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public Response getRequest(@PathParam("id") String id, @PathParam("id") String requestID);
+
+ @DELETE
+ @Path("/{id}/requests/{id}")
+ public Response deleteRequest(@PathParam("id") String id, @PathParam("id") String requestID);
+}
Added: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/UsersResource.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/UsersResource.java?rev=1459881&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/UsersResource.java (added)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/UsersResource.java Fri Mar 22 16:12:58 2013
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rave.rest;
+
+import org.apache.rave.rest.model.User;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Path("/users")
+public interface UsersResource {
+
+ @GET
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public Response getUsers();
+
+ @GET
+ @Path("/{id}")
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public Response getUser(@PathParam("id") String id);
+
+ @PUT
+ @Path("/{id}")
+ @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public Response updateUser(@PathParam("id") String id, User user);
+}
Added: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/Person.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/Person.java?rev=1459881&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/Person.java (added)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/Person.java Fri Mar 22 16:12:58 2013
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rave.rest.model;
+
+import javax.xml.bind.annotation.*;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Person", propOrder = {
+ "id", "username", "displayName", "emailAddress"
+})
+@XmlRootElement(name = "Person")
+public class Person {
+ @XmlAttribute(name = "id")
+ private String id;
+ @XmlElement(name = "Username")
+ private String username;
+ @XmlElement(name = "DisplayName")
+ private String displayName;
+ @XmlElement(name = "EmailAddress")
+ private String emailAddress;
+
+ public Person(org.apache.rave.model.Person person) {
+ id = person.getId();
+ username = person.getUsername();
+ displayName = person.getDisplayName();
+ emailAddress = person.getEmail();
+ }
+
+ public Person() {
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
+ public String getEmailAddress() {
+ return emailAddress;
+ }
+
+ public void setEmailAddress(String emailAddress) {
+ this.emailAddress = emailAddress;
+ }
+
+ public void saveToPerson(org.apache.rave.model.Person person) {
+ if (person.getId() != null && !person.getId().equals(id)) {
+ throw new RuntimeException("You cannot change the ID of a Person object");
+ }
+
+ if (username != null) { person.setUsername(username); }
+ if (displayName != null) { person.setDisplayName(displayName); }
+ if (emailAddress != null) { person.setEmail(emailAddress); }
+ }
+
+}
Added: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/PersonList.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/PersonList.java?rev=1459881&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/PersonList.java (added)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/PersonList.java Fri Mar 22 16:12:58 2013
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rave.rest.model;
+
+import javax.xml.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.List;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "People", propOrder = {
+ "people"
+})
+@XmlRootElement(name = "People")
+public class PersonList {
+ @XmlElement(name = "Person")
+ protected List<Person> people;
+
+ public List<Person> getPeople() {
+ if (people == null) {
+ people = new ArrayList<Person>();
+ }
+ return this.people;
+ }
+}
Added: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/User.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/User.java?rev=1459881&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/User.java (added)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/model/User.java Fri Mar 22 16:12:58 2013
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rave.rest.model;
+
+import javax.xml.bind.annotation.*;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "User", propOrder = {
+ "id", "username", "locked", "enabled"
+})
+@XmlRootElement(name = "User")
+public class User {
+ @XmlAttribute(name = "id")
+ private String id;
+ @XmlElement(name = "Username")
+ private String username;
+ @XmlElement(name = "Locked")
+ private Boolean locked;
+ @XmlElement(name = "Enabled")
+ private Boolean enabled;
+
+ public User(){}
+
+ public User(org.apache.rave.model.User user) {
+ this.id = user.getId();
+ this.username = user.getUsername();
+ this.locked = user.isLocked();
+ this.enabled = user.isEnabled();
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public Boolean isLocked() {
+ return locked;
+ }
+
+ public void setLocked(Boolean locked) {
+ this.locked = locked;
+ }
+
+ public Boolean isEnabled() {
+ return enabled;
+ }
+
+ public void setEnabled(Boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ public void saveToUser(org.apache.rave.model.User user) {
+ if (user.getId() != null && !user.getId().equals(id)) {
+ throw new RuntimeException("You cannot change the ID of a User object");
+ }
+
+ if (username != null) { user.setUsername(username); }
+ if (locked != null) { user.setLocked(locked); }
+ if (enabled != null) { user.setEnabled(enabled); }
+ }
+
+}
Modified: rave/trunk/rave-components/rave-core/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/pom.xml?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/pom.xml (original)
+++ rave/trunk/rave-components/rave-core/pom.xml Fri Mar 22 16:12:58 2013
@@ -51,6 +51,10 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-core-api</artifactId>
+ </dependency>
<!-- Shindig -->
<dependency>
@@ -84,6 +88,10 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-openid</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-oxm</artifactId>
+ </dependency>
<!-- Jackson JSON Mapper -->
<dependency>
@@ -154,6 +162,11 @@
<artifactId>freemarker</artifactId>
</dependency>
+ <!-- CXF -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ </dependency>
<!-- Test -->
<dependency>
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsEntryImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsEntryImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsEntryImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsEntryImpl.java Fri Mar 22 16:12:58 2013
@@ -20,9 +20,9 @@
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.ActivityStreamsEntry;
-import org.apache.rave.portal.model.ActivityStreamsMediaLink;
-import org.apache.rave.portal.model.ActivityStreamsObject;
+import org.apache.rave.model.ActivityStreamsMediaLink;
+import org.apache.rave.model.ActivityStreamsObject;
+import org.apache.rave.model.ActivityStreamsEntry;
import java.util.Date;
import java.util.Map;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsMediaLinkImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsMediaLinkImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsMediaLinkImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsMediaLinkImpl.java Fri Mar 22 16:12:58 2013
@@ -21,12 +21,12 @@
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.ActivityStreamsMediaLink;
+import org.apache.rave.model.ActivityStreamsMediaLink;
import java.util.Map;
-public class ActivityStreamsMediaLinkImpl implements ActivityStreamsMediaLink{
+public class ActivityStreamsMediaLinkImpl implements ActivityStreamsMediaLink {
private static final long serialVersionUID = 1L;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsObjectImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsObjectImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsObjectImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsObjectImpl.java Fri Mar 22 16:12:58 2013
@@ -20,8 +20,8 @@
package org.apache.rave.portal.model.impl;
import com.google.common.collect.Lists;
-import org.apache.rave.portal.model.ActivityStreamsMediaLink;
-import org.apache.rave.portal.model.ActivityStreamsObject;
+import org.apache.rave.model.ActivityStreamsMediaLink;
+import org.apache.rave.model.ActivityStreamsObject;
import java.util.Date;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.Address;
+import org.apache.rave.model.Address;
/**
*/
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.ApplicationData;
+import org.apache.rave.model.ApplicationData;
import java.util.Map;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java Fri Mar 22 16:12:58 2013
@@ -18,8 +18,8 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
+import org.apache.rave.model.Authority;
import org.springframework.security.core.GrantedAuthority;
import java.util.ArrayList;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,8 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.Category;
+import org.apache.rave.model.Widget;
import java.util.Date;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/GroupImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/GroupImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/GroupImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/GroupImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.Group;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthConsumerStoreImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthConsumerStoreImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthConsumerStoreImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthConsumerStoreImpl.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.OAuthConsumerStore;
+import org.apache.rave.model.OAuthConsumerStore;
public class OAuthConsumerStoreImpl implements OAuthConsumerStore {
private String id;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthTokenInfoImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthTokenInfoImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthTokenInfoImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthTokenInfoImpl.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.OAuthTokenInfo;
+import org.apache.rave.model.OAuthTokenInfo;
public class OAuthTokenInfoImpl implements OAuthTokenInfo {
private String id;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OrganizationImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OrganizationImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OrganizationImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OrganizationImpl.java Fri Mar 22 16:12:58 2013
@@ -17,8 +17,8 @@
* under the License.
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.Address;
-import org.apache.rave.portal.model.Organization;
+import org.apache.rave.model.Address;
+import org.apache.rave.model.Organization;
import java.util.Date;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageLayoutImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageLayoutImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageLayoutImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageLayoutImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.PageLayout;
+import org.apache.rave.model.PageLayout;
public class PageLayoutImpl implements PageLayout {
private String code;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,10 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.PageLayout;
+import org.apache.rave.model.PageTemplate;
+import org.apache.rave.model.PageTemplateRegion;
+import org.apache.rave.model.PageType;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,9 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.PageTemplate;
+import org.apache.rave.model.PageTemplateRegion;
+import org.apache.rave.model.PageTemplateWidget;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,8 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.PageTemplateRegion;
+import org.apache.rave.model.PageTemplateWidget;
public class PageTemplateWidgetImpl implements PageTemplateWidget {
private String id;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,9 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.PageInvitationStatus;
+import org.apache.rave.model.PageUser;
import org.codehaus.jackson.annotate.JsonBackReference;
public class PageUserImpl implements PageUser {
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,10 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.Address;
+import org.apache.rave.model.Organization;
+import org.apache.rave.model.Person;
+import org.apache.rave.model.PersonProperty;
import java.io.Serializable;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.PersonProperty;
+import org.apache.rave.model.PersonProperty;
/** **/
public class PersonPropertyImpl implements PersonProperty {
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.model.impl;
import org.apache.rave.exception.NotSupportedException;
-import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.model.PortalPreference;
import java.util.ArrayList;
import java.util.LinkedList;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java Fri Mar 22 16:12:58 2013
@@ -18,9 +18,9 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.Page;
-import org.apache.rave.portal.model.Region;
-import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.Region;
+import org.apache.rave.model.RegionWidget;
import org.codehaus.jackson.annotate.JsonBackReference;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java Fri Mar 22 16:12:58 2013
@@ -18,9 +18,9 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.Region;
-import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.model.Region;
+import org.apache.rave.model.RegionWidget;
+import org.apache.rave.model.RegionWidgetPreference;
import org.codehaus.jackson.annotate.JsonBackReference;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.model.RegionWidgetPreference;
public class RegionWidgetPreferenceImpl implements RegionWidgetPreference {
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/TagImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/TagImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/TagImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/TagImpl.java Fri Mar 22 16:12:58 2013
@@ -18,8 +18,8 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.Tag;
-import org.apache.rave.portal.model.WidgetTag;
+import org.apache.rave.model.Tag;
+import org.apache.rave.model.WidgetTag;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java Fri Mar 22 16:12:58 2013
@@ -18,10 +18,10 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.PageLayout;
-import org.apache.rave.portal.model.Person;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.Authority;
+import org.apache.rave.model.PageLayout;
+import org.apache.rave.model.Person;
+import org.apache.rave.model.User;
import org.apache.rave.util.CollectionUtils;
import org.springframework.security.core.GrantedAuthority;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.WidgetComment;
import java.util.Date;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import java.util.ArrayList;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.WidgetRating;
+import org.apache.rave.model.WidgetRating;
public class WidgetRatingImpl implements WidgetRating {
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java Fri Mar 22 16:12:58 2013
@@ -18,9 +18,9 @@
*/
package org.apache.rave.portal.model.impl;
-import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.model.Tag;
-import org.apache.rave.portal.model.WidgetTag;
+import org.apache.rave.model.Tag;
+import org.apache.rave.model.User;
+import org.apache.rave.model.WidgetTag;
import java.util.Date;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/ModelUtils.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/ModelUtils.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/ModelUtils.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/ModelUtils.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.model.util;
-import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.model.RegionWidgetPreference;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java Fri Mar 22 16:12:58 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.model.uti
import java.util.ArrayList;
import java.util.List;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.ExternalWidgetImpl;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonProperty;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceWidgetResult.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceWidgetResult.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceWidgetResult.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceWidgetResult.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.model.util;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.ExternalWidgetImpl;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonProperty;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/omdl/OmdlOutputAdapter.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/omdl/OmdlOutputAdapter.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/omdl/OmdlOutputAdapter.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/omdl/OmdlOutputAdapter.java Fri Mar 22 16:12:58 2013
@@ -28,13 +28,11 @@ import javax.xml.bind.annotation.XmlElem
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlValue;
-import org.apache.rave.portal.model.Page;
-import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.User;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.service.WidgetService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
/**
* This is a jaxb page export format for the OMDL specification
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ActivityStreamsRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ActivityStreamsRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ActivityStreamsRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ActivityStreamsRepository.java Fri Mar 22 16:12:58 2013
@@ -20,7 +20,7 @@
package org.apache.rave.portal.repository;
import org.apache.rave.persistence.Repository;
-import org.apache.rave.portal.model.ActivityStreamsEntry;
+import org.apache.rave.model.ActivityStreamsEntry;
import java.util.List;
@@ -28,7 +28,7 @@ public interface ActivityStreamsReposito
/**
* Retrieves all ActivityStreamsEntry instances from the persistence layer
- * @return a list of {@link ActivityStreamsEntry}
+ * @return a list of {@link org.apache.rave.model.ActivityStreamsEntry}
*/
List<ActivityStreamsEntry> getAll();
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ApplicationDataRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ApplicationDataRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ApplicationDataRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ApplicationDataRepository.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.repository;
-import org.apache.rave.portal.model.ApplicationData;
+import org.apache.rave.model.ApplicationData;
import org.apache.rave.persistence.Repository;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java Fri Mar 22 16:12:58 2013
@@ -20,17 +20,17 @@
package org.apache.rave.portal.repository;
import org.apache.rave.persistence.Repository;
-import org.apache.rave.portal.model.Authority;
+import org.apache.rave.model.Authority;
import java.util.List;
/**
- * Repository interface for {@link org.apache.rave.portal.model.Authority}
+ * Repository interface for {@link org.apache.rave.model.Authority}
*/
public interface AuthorityRepository extends Repository<Authority> {
/**
- * Finds the {@link org.apache.rave.portal.model.Authority} by its name
+ * Finds the {@link org.apache.rave.model.Authority} by its name
*
* @param authorityName (unique) name of the Authority
* @return Authority if it can be found, otherwise {@literal null}
@@ -38,12 +38,12 @@ public interface AuthorityRepository ext
Authority getByAuthority(String authorityName);
/**
- * @return a List of all {@link org.apache.rave.portal.model.Authority}'s.
+ * @return a List of all {@link org.apache.rave.model.Authority}'s.
*/
List<Authority> getAll();
/**
- * @return a List of all default {@link org.apache.rave.portal.model.Authority}'s.
+ * @return a List of all default {@link org.apache.rave.model.Authority}'s.
*/
List<Authority> getAllDefault();
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java Fri Mar 22 16:12:58 2013
@@ -16,7 +16,7 @@
package org.apache.rave.portal.repository;
import org.apache.rave.persistence.Repository;
-import org.apache.rave.portal.model.Category;
+import org.apache.rave.model.Category;
import java.util.List;
public interface CategoryRepository extends Repository<Category> {
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/OAuthConsumerStoreRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/OAuthConsumerStoreRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/OAuthConsumerStoreRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/OAuthConsumerStoreRepository.java Fri Mar 22 16:12:58 2013
@@ -19,20 +19,20 @@
package org.apache.rave.portal.repository;
-import org.apache.rave.portal.model.OAuthConsumerStore;
+import org.apache.rave.model.OAuthConsumerStore;
import org.apache.rave.persistence.Repository;
/**
- * Repository interface for {@link org.apache.rave.portal.model.OAuthConsumerStore}
+ * Repository interface for {@link org.apache.rave.model.OAuthConsumerStore}
*/
public interface OAuthConsumerStoreRepository extends Repository<OAuthConsumerStore> {
/**
- * Fetches {@link org.apache.rave.portal.model.OAuthConsumerStore} based on the gadget location and the service provider
+ * Fetches {@link org.apache.rave.model.OAuthConsumerStore} based on the gadget location and the service provider
*
* @param gadgetUri location of the gadget definition
* @param serviceName name of the service provider
- * @return {@link org.apache.rave.portal.model.OAuthConsumerStore} or {@literal null} if none matches the criteria
+ * @return {@link org.apache.rave.model.OAuthConsumerStore} or {@literal null} if none matches the criteria
*/
OAuthConsumerStore findByUriAndServiceName(String gadgetUri, String serviceName);
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/OAuthTokenInfoRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/OAuthTokenInfoRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/OAuthTokenInfoRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/OAuthTokenInfoRepository.java Fri Mar 22 16:12:58 2013
@@ -19,23 +19,23 @@
package org.apache.rave.portal.repository;
-import org.apache.rave.portal.model.OAuthTokenInfo;
+import org.apache.rave.model.OAuthTokenInfo;
import org.apache.rave.persistence.Repository;
/**
- * Interface for handling {@link org.apache.rave.portal.model.OAuthTokenInfo} queries
+ * Interface for handling {@link org.apache.rave.model.OAuthTokenInfo} queries
*/
public interface OAuthTokenInfoRepository extends Repository<OAuthTokenInfo> {
/**
- * Retrieves {@link org.apache.rave.portal.model.OAuthTokenInfo}
+ * Retrieves {@link org.apache.rave.model.OAuthTokenInfo}
*
* @param userId unique identifier of gadget viewer
* @param appUrl URL of the gadget
* @param moduleId the module ID of the application
* @param tokenName gadget's nickname for the token to use
* @param serviceName name of the service provider
- * @return {@link org.apache.rave.portal.model.OAuthTokenInfo} or {@literal null} if none matches the criteria
+ * @return {@link org.apache.rave.model.OAuthTokenInfo} or {@literal null} if none matches the criteria
*/
OAuthTokenInfo findOAuthTokenInfo(String userId, String appUrl, String moduleId,
String tokenName, String serviceName);
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.repository;
import org.apache.rave.persistence.Repository;
-import org.apache.rave.portal.model.PageLayout;
+import org.apache.rave.model.PageLayout;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java Fri Mar 22 16:12:58 2013
@@ -19,12 +19,12 @@
package org.apache.rave.portal.repository;
import org.apache.rave.persistence.Repository;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import java.util.List;
/**
- * Provides persistence operations for the {@link org.apache.rave.portal.model.Page} class
+ * Provides persistence operations for the {@link org.apache.rave.model.Page} class
*/
public interface PageRepository extends Repository<Page> {
/**
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageTemplateRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageTemplateRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageTemplateRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageTemplateRepository.java Fri Mar 22 16:12:58 2013
@@ -18,8 +18,8 @@
*/
package org.apache.rave.portal.repository;
-import org.apache.rave.portal.model.PageTemplate;
-import org.apache.rave.portal.model.PageType;
+import org.apache.rave.model.PageTemplate;
+import org.apache.rave.model.PageType;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PersonRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PersonRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PersonRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PersonRepository.java Fri Mar 22 16:12:58 2013
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.List;
import org.apache.rave.persistence.Repository;
-import org.apache.rave.portal.model.Person;
+import org.apache.rave.model.Person;
public interface PersonRepository extends Repository<Person> {
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java Fri Mar 22 16:12:58 2013
@@ -20,12 +20,12 @@
package org.apache.rave.portal.repository;
import org.apache.rave.persistence.Repository;
-import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.model.PortalPreference;
import java.util.List;
/**
- * Provides persistence operations for the {@link org.apache.rave.portal.model.PortalPreference}
+ * Provides persistence operations for the {@link org.apache.rave.model.PortalPreference}
*/
public interface PortalPreferenceRepository extends Repository<PortalPreference> {
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java Fri Mar 22 16:12:58 2013
@@ -20,7 +20,7 @@ package org.apache.rave.portal.repositor
import org.apache.rave.persistence.Repository;
-import org.apache.rave.portal.model.Region;
+import org.apache.rave.model.Region;
/**
* Provides persistence operations for the {@link Region} class
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java Fri Mar 22 16:12:58 2013
@@ -19,6 +19,6 @@
package org.apache.rave.portal.repository;
import org.apache.rave.persistence.Repository;
-import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.model.RegionWidget;
public interface RegionWidgetRepository extends Repository<RegionWidget> { }
\ No newline at end of file
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java Fri Mar 22 16:12:58 2013
@@ -20,16 +20,16 @@
package org.apache.rave.portal.repository;
import org.apache.rave.persistence.Repository;
-import org.apache.rave.portal.model.Tag;
+import org.apache.rave.model.Tag;
import java.util.List;
/**
- * Repository interface for {@link org.apache.rave.portal.model.Tag}
+ * Repository interface for {@link org.apache.rave.model.Tag}
*/
public interface TagRepository extends Repository<Tag> {
/**
- * @return a List of all {@link org.apache.rave.portal.model.Tag}'s.
+ * @return a List of all {@link org.apache.rave.model.Tag}'s.
*/
List<Tag> getAll();