LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corrects renaming errors in package path portation 

git-svn-id: https://svn.libreccm.org/ccm/trunk@4157 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2016-06-15 15:19:38 +00:00
parent 7eb7d12aba
commit 00d785e5c1
7 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java
View File

@ -16,13 +16,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
package com.arsdigita.portation.categories.core.security; package com.arsdigita.portation.modules.core.security;
import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.AbstractMarshaller;
import com.arsdigita.portation.Identifiable; import com.arsdigita.portation.Identifiable;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Set; import java.util.Set;
/** /**
@ -34,10 +33,6 @@ public class Group extends Party {
private Set<GroupMembership> memberships = new HashSet<>(); private Set<GroupMembership> memberships = new HashSet<>();
public Group() {
}
@Override @Override
public AbstractMarshaller<? extends Identifiable> getMarshaller() { public AbstractMarshaller<? extends Identifiable> getMarshaller() {
return new GroupMarshaller(); return new GroupMarshaller();

2
ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMarshaller.java
View File

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
package com.arsdigita.portation.categories.core.security; package com.arsdigita.portation.modules.core.security;
import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.AbstractMarshaller;

2
ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java
View File

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
package com.arsdigita.portation.categories.core.security; package com.arsdigita.portation.modules.core.security;
import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.AbstractMarshaller;
import com.arsdigita.portation.Identifiable; import com.arsdigita.portation.Identifiable;

2
ccm-core/src/com/arsdigita/portation/modules/core/security/PartyMarshaller.java
View File

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
package com.arsdigita.portation.categories.core.security; package com.arsdigita.portation.modules.core.security;
import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.AbstractMarshaller;

5
ccm-core/src/com/arsdigita/portation/modules/core/security/User.java
View File

@ -16,12 +16,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
package com.arsdigita.portation.categories.core.security; package com.arsdigita.portation.modules.core.security;
import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.AbstractMarshaller;
import com.arsdigita.portation.Identifiable; import com.arsdigita.portation.Identifiable;
import com.arsdigita.portation.categories.core.core.EmailAddress; import com.arsdigita.portation.modules.core.core.EmailAddress;
import com.arsdigita.portation.categories.core.utils.CollectionConverter;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;

2
ccm-core/src/com/arsdigita/portation/modules/core/security/UserMarshaller.java
View File

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
package com.arsdigita.portation.categories.core.security; package com.arsdigita.portation.modules.core.security;
import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.AbstractMarshaller;

14
ccm-core/src/com/arsdigita/portation/modules/core/utils/CollectionConverter.java
View File

@ -16,15 +16,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
package com.arsdigita.portation.categories.core.utils; package com.arsdigita.portation.modules.core.utils;
import com.arsdigita.kernel.EmailAddress; import com.arsdigita.kernel.EmailAddress;
import com.arsdigita.kernel.GroupCollection; import com.arsdigita.kernel.GroupCollection;
import com.arsdigita.kernel.PartyCollection; import com.arsdigita.kernel.PartyCollection;
import com.arsdigita.kernel.UserCollection; import com.arsdigita.kernel.UserCollection;
import com.arsdigita.portation.categories.core.security.Group; import com.arsdigita.portation.modules.core.security.Group;
import com.arsdigita.portation.categories.core.security.Party; import com.arsdigita.portation.modules.core.security.Party;
import com.arsdigita.portation.categories.core.security.User; import com.arsdigita.portation.modules.core.security.User;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import java.util.ArrayList; import java.util.ArrayList;
@ -42,7 +42,7 @@ public class CollectionConverter {
List<Party> parties = new ArrayList<>(); List<Party> parties = new ArrayList<>();
if (partyCollection != null) { if (partyCollection != null) {
while (partyCollection.next()) { while (partyCollection.next()) {
parties.add(new Party(partyCollection.getParty())); parties.add(new Party());
} }
partyCollection.close(); partyCollection.close();
} else { } else {
@ -55,7 +55,7 @@ public class CollectionConverter {
List<User> users = new ArrayList<>(); List<User> users = new ArrayList<>();
if (userCollection != null) { if (userCollection != null) {
while (userCollection.next()) { while (userCollection.next()) {
users.add(new User(userCollection.getUser())); users.add(new User());
} }
userCollection.close(); userCollection.close();
} else { } else {
@ -68,7 +68,7 @@ public class CollectionConverter {
List<Group> groups = new ArrayList<>(); List<Group> groups = new ArrayList<>();
if (groupCollection != null) { if (groupCollection != null) {
while (groupCollection.next()) { while (groupCollection.next()) {
groups.add(new Group(groupCollection.getGroup())); groups.add(new Group());
} }
groupCollection.close(); groupCollection.close();
} else { } else {