[jboss-svn-commits] JBoss PortletSwap SVN: r220 - in src: server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/repository/impl/jcr and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jan 25 06:47:37 EST 2008
Author: thomas.heute at jboss.com
Date: 2008-01-25 06:47:37 -0500 (Fri, 25 Jan 2008)
New Revision: 220
Modified:
src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/model/impl/jcr/JCRModuleImpl.java
src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/repository/impl/jcr/RepositoryServiceImpl.java
src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/repository/impl/memory/RepositoryServiceImpl.java
src/server/trunk/server-service/server-lib/src/main/resources/customNodes.cnd
src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/directory/impl/jcr/DirectoryServiceTestCase.java
src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/directory/impl/memory/DirectoryServiceTestCase.java
src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/repository/impl/jcr/RepositoryServiceTestCase.java
src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/repository/impl/memory/RepositoryServiceTestCase.java
src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/Artifact.java
src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/Module.java
src/server/trunk/server-webapp/src/main/java/org/jboss/portletswap/servlet/DirectoryServlet.java
src/textClient/src/main/java/org/jboss/portletswap/textclient/TextClient.java
Log:
Version is now part of the artifact
Modified: src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/model/impl/jcr/JCRModuleImpl.java
===================================================================
--- src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/model/impl/jcr/JCRModuleImpl.java 2008-01-24 10:31:46 UTC (rev 219)
+++ src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/model/impl/jcr/JCRModuleImpl.java 2008-01-25 11:47:37 UTC (rev 220)
@@ -39,13 +39,12 @@
import org.apache.jackrabbit.value.ReferenceValue;
import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.common.util.Version;
-import org.jboss.portletswap.model.Type;
import org.jboss.portletswap.jcr.JCRService;
import org.jboss.portletswap.model.Artifact;
import org.jboss.portletswap.model.Author;
import org.jboss.portletswap.model.Category;
import org.jboss.portletswap.model.Module;
+import org.jboss.portletswap.model.Type;
/**
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -64,7 +63,7 @@
setName(node.getProperty("ps:name").getString());
setId(node.getUUID());
-
+/*
Node versionNode = node.getNode("ps:version");
Version version = new Version(versionNode.getProperty("ps:name").getString(),
(int)versionNode.getProperty("ps:major").getValue().getLong(),
@@ -75,7 +74,7 @@
Version.Qualifier.Suffix.valueOf(versionNode.getProperty("ps:suffix").getValue().getString())),
versionNode.getProperty("ps:codename").getValue().getString());
setVersion(version);
-
+*/
NodeIterator it = node.getNodes("ps:description");
Map<Locale, String> values = new HashMap<Locale, String>();
while (it.hasNext())
Modified: src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/repository/impl/jcr/RepositoryServiceImpl.java
===================================================================
--- src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/repository/impl/jcr/RepositoryServiceImpl.java 2008-01-24 10:31:46 UTC (rev 219)
+++ src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/repository/impl/jcr/RepositoryServiceImpl.java 2008-01-25 11:47:37 UTC (rev 220)
@@ -260,6 +260,7 @@
// Store the last modified date
moduleNode.setProperty("jcr:lastModified", new DateValue(Calendar.getInstance()));
+ /*
// Store the version
Version version = module.getVersion();
Node versionNode = moduleNode.addNode("ps:version", "ps:version");
@@ -272,6 +273,7 @@
versionNode.setProperty("ps:suffix", version.getQualifier().getSuffix().name());
versionNode.setProperty("ps:codename", version.getCodeName());
}
+ */
// Store the description
LocalizedString description = module.getDescription();
@@ -445,6 +447,19 @@
}
artifactNode.setProperty("ps:type", artifact.getType().name());
+ // Store the version
+ Version version = artifact.getVersion();
+ Node versionNode = artifactNode.addNode("ps:version", "ps:version");
+ {
+ versionNode.setProperty("ps:name", version.getName());
+ versionNode.setProperty("ps:major", version.getMajor());
+ versionNode.setProperty("ps:minor", version.getMinor());
+ versionNode.setProperty("ps:patch", version.getPatch());
+ versionNode.setProperty("ps:prefix", version.getQualifier().getPrefix().getName());
+ versionNode.setProperty("ps:suffix", version.getQualifier().getSuffix().name());
+ versionNode.setProperty("ps:codename", version.getCodeName());
+ }
+
// Store the description
LocalizedString description = module.getDescription();
if (description != null)
Modified: src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/repository/impl/memory/RepositoryServiceImpl.java
===================================================================
--- src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/repository/impl/memory/RepositoryServiceImpl.java 2008-01-24 10:31:46 UTC (rev 219)
+++ src/server/trunk/server-service/server-lib/src/main/java/org/jboss/portletswap/repository/impl/memory/RepositoryServiceImpl.java 2008-01-25 11:47:37 UTC (rev 220)
@@ -67,7 +67,7 @@
public Module storeModule(Module module) throws RepositoryException
{
- ((Module)module).setId(module.getName() + module.getVersion());
+ ((Module)module).setId(module.getName());
modules.put(module.getId(), module);
return module;
}
Modified: src/server/trunk/server-service/server-lib/src/main/resources/customNodes.cnd
===================================================================
--- src/server/trunk/server-service/server-lib/src/main/resources/customNodes.cnd 2008-01-24 10:31:46 UTC (rev 219)
+++ src/server/trunk/server-service/server-lib/src/main/resources/customNodes.cnd 2008-01-25 11:47:37 UTC (rev 220)
@@ -29,6 +29,7 @@
- ps:lastname
[ps:artifact] > nt:base, mix:referenceable
+ + ps:version mandatory
[ps:fileArtifact] > ps:artifact
- jcr:lastModified (date) mandatory ignore
@@ -42,7 +43,6 @@
- ps:name (string)
+ ps:author
+ ps:description
- + ps:version mandatory
+ ps:artifact multiple
[ps:version] > nt:base
Modified: src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/directory/impl/jcr/DirectoryServiceTestCase.java
===================================================================
--- src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/directory/impl/jcr/DirectoryServiceTestCase.java 2008-01-24 10:31:46 UTC (rev 219)
+++ src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/directory/impl/jcr/DirectoryServiceTestCase.java 2008-01-25 11:47:37 UTC (rev 220)
@@ -32,8 +32,6 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.jboss.portal.common.util.Version;
-import org.jboss.portal.common.util.Version.Qualifier;
import org.jboss.portletswap.PortletswapException;
import org.jboss.portletswap.jcr.JCRService;
import org.jboss.portletswap.jcr.JCRServiceImpl;
@@ -75,10 +73,8 @@
repositoryService = new RepositoryServiceImpl();
repositoryService.setJcrService(jcrService);
+ module = new Module("Foo");
- Version version = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.ALPHA), "");
- module = new Module("Foo", version);
-
try
{
@@ -180,7 +176,7 @@
@Test
public void testGetModulesForOneCategory() throws PortletswapException
{
- Module module2 = new Module("Bar", module.getVersion());
+ Module module2 = new Module("Bar");
module2 = repositoryService.storeModule(module2);
List<Module> modules = directoryService.getModules(false);
assertEquals(2, modules.size());
Modified: src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/directory/impl/memory/DirectoryServiceTestCase.java
===================================================================
--- src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/directory/impl/memory/DirectoryServiceTestCase.java 2008-01-24 10:31:46 UTC (rev 219)
+++ src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/directory/impl/memory/DirectoryServiceTestCase.java 2008-01-25 11:47:37 UTC (rev 220)
@@ -26,8 +26,6 @@
import java.util.List;
-import org.jboss.portal.common.util.Version;
-import org.jboss.portal.common.util.Version.Qualifier;
import org.jboss.portletswap.DirectoryService;
import org.jboss.portletswap.PortletswapException;
import org.jboss.portletswap.model.Module;
@@ -46,12 +44,10 @@
{
RepositoryServiceImpl repositoryService = new RepositoryServiceImpl();
- Version version1 = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.ALPHA), "");
- Module module1 = new Module("Foo", version1);
+ Module module1 = new Module("Foo");
repositoryService.storeModule(module1);
- Version version2 = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.CR), "");
- Module module2 = new Module("Foo", version2);
+ Module module2 = new Module("Foo2");
repositoryService.storeModule(module2);
DirectoryService directoryService = new DirectoryServiceImpl();
@@ -60,8 +56,7 @@
List<Module> modules = directoryService.getModules(false);
assertEquals(2, modules.size());
- Version version3 = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.BETA), "");
- Module module3 = new Module("Foo", version3);
+ Module module3 = new Module("Foo3");
repositoryService.storeModule(module3);
modules = directoryService.getModules(false);
Modified: src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/repository/impl/jcr/RepositoryServiceTestCase.java
===================================================================
--- src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/repository/impl/jcr/RepositoryServiceTestCase.java 2008-01-24 10:31:46 UTC (rev 219)
+++ src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/repository/impl/jcr/RepositoryServiceTestCase.java 2008-01-25 11:47:37 UTC (rev 220)
@@ -38,9 +38,7 @@
import org.jboss.portal.common.i18n.LocalizedString;
import org.jboss.portal.common.util.Version;
-import org.jboss.portal.common.util.Version.Qualifier;
import org.jboss.portletswap.PortletswapException;
-import org.jboss.portletswap.model.Type;
import org.jboss.portletswap.jcr.JCRService;
import org.jboss.portletswap.jcr.JCRServiceImpl;
import org.jboss.portletswap.model.Artifact;
@@ -48,6 +46,7 @@
import org.jboss.portletswap.model.FileArtifact;
import org.jboss.portletswap.model.License;
import org.jboss.portletswap.model.Module;
+import org.jboss.portletswap.model.Type;
import org.jboss.portletswap.repository.NotFoundException;
import org.jboss.unit.api.pojo.annotations.Create;
import org.jboss.unit.api.pojo.annotations.Destroy;
@@ -137,8 +136,7 @@
@Test
public void testRegisterModule()
{
- Version version = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.ALPHA), "");
- Module module = new Module("Foo", version);
+ Module module = new Module("Foo");
assertNull(module.getId());
try
{
@@ -161,14 +159,12 @@
}
assertNotNull(getModule);
assertEquals(id, getModule.getId());
- assertEquals(version.toString(), module.getVersion().toString());
}
@Test
public void testRegisterModuleWithDescription()
{
- Version version = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.ALPHA), "");
- Module module = new Module("Foo", version);
+ Module module = new Module("Foo");
module.setDescription(new LocalizedString("Toto is bo"));
try
{
@@ -185,8 +181,7 @@
@Test
public void testAddCategoryToModule() throws Exception
{
- Version version = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.ALPHA), "");
- Module module = new Module("Foo", version);
+ Module module = new Module("Foo");
assertNull(module.getId());
try
{
@@ -268,8 +263,7 @@
@Test
public void testDeleteModule() throws Exception
{
- Version version = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.ALPHA), "");
- Module module = new Module("Test", version);
+ Module module = new Module("Test");
assertNull(module.getId());
module = repositoryService.storeModule(module);
Object id = module.getId();
@@ -294,8 +288,7 @@
@Test
public void testPublishModule() throws Exception
{
- Version version = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.ALPHA), "");
- Module module = new Module("Test", version);
+ Module module = new Module("Test");
assertNull(module.getId());
module = repositoryService.storeModule(module);
Object id = module.getId();
@@ -323,14 +316,16 @@
@Test
public void testAddArtifact() throws Exception
{
- Version version = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.ALPHA), "");
- Module module = new Module("Test", version);
+ Module module = new Module("Test");
assertNull(module.getId());
Module retModule = repositoryService.storeModule(module);
+ Version version = new Version("", 1, 0, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA), "");
+
InputStream is = new FileInputStream("/tmp/test");
Artifact artifact = new FileArtifact(Type.JSR168PORTLET, new File("/tmp/test"), is);
((FileArtifact)artifact).setName("Bozo");
+ artifact.setVersion(version);
License license = new License("LGPL", "blah");
license = repositoryService.storeLicense(license);
Modified: src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/repository/impl/memory/RepositoryServiceTestCase.java
===================================================================
--- src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/repository/impl/memory/RepositoryServiceTestCase.java 2008-01-24 10:31:46 UTC (rev 219)
+++ src/server/trunk/server-service/server-lib/src/test/java/org/jboss/portletswap/repository/impl/memory/RepositoryServiceTestCase.java 2008-01-25 11:47:37 UTC (rev 220)
@@ -24,8 +24,6 @@
import static org.jboss.unit.api.Assert.assertNotNull;
-import org.jboss.portal.common.util.Version;
-import org.jboss.portal.common.util.Version.Qualifier;
import org.jboss.portletswap.PortletswapException;
import org.jboss.portletswap.RepositoryService;
import org.jboss.portletswap.model.Artifact;
@@ -44,8 +42,7 @@
public void testRegister() throws PortletswapException
{
RepositoryService repositoryService = new RepositoryServiceImpl();
- Version version = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.ALPHA), "");
- Module module = new Module("Foo", version);
+ Module module = new Module("Foo");
repositoryService.storeModule(module);
assertNotNull(module.getId());
@@ -65,8 +62,7 @@
public void testAddArtifact() throws PortletswapException
{
RepositoryService repositoryService = new RepositoryServiceImpl();
- Version version = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.ALPHA), "");
- Module module = new Module("Foo", version);
+ Module module = new Module("Foo");
Artifact artifact = new FileArtifact(Type.JSR168PORTLET, null, null);
module = repositoryService.storeModule(module);
repositoryService.storeArtifact(module, artifact);
Modified: src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/Artifact.java
===================================================================
--- src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/Artifact.java 2008-01-24 10:31:46 UTC (rev 219)
+++ src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/Artifact.java 2008-01-25 11:47:37 UTC (rev 220)
@@ -23,6 +23,7 @@
package org.jboss.portletswap.model;
import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.common.util.Version;
/**
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -38,6 +39,8 @@
private Type type;
+ private Version version;
+
private LocalizedString description;
private LocalizedString displayName;
@@ -126,6 +129,16 @@
this.name = name;
}
+ public Version getVersion()
+ {
+ return version;
+ }
+
+ public void setVersion(Version version)
+ {
+ this.version = version;
+ }
+
}
Modified: src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/Module.java
===================================================================
--- src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/Module.java 2008-01-24 10:31:46 UTC (rev 219)
+++ src/server/trunk/server-service/server-model/src/main/java/org/jboss/portletswap/model/Module.java 2008-01-25 11:47:37 UTC (rev 220)
@@ -26,7 +26,6 @@
import java.util.List;
import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.common.util.Version;
/**
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -40,21 +39,12 @@
private String name;
- private Version version;
-
private LocalizedString description;
private List<Author> authors;
private List<Category> categories = new ArrayList<Category>();
- public Module(String name, Version version)
- {
- this.version = version;
- this.name = name;
- this.artifacts = new ArrayList<Artifact>();
- }
-
public Module(String name)
{
this.name = name;
@@ -71,11 +61,6 @@
return id;
}
- public Version getVersion()
- {
- return version;
- }
-
public Type getType()
{
Type type = null;
@@ -127,11 +112,6 @@
return name;
}
- public void setVersion(Version version)
- {
- this.version = version;
- }
-
public LocalizedString getDescription()
{
return description;
Modified: src/server/trunk/server-webapp/src/main/java/org/jboss/portletswap/servlet/DirectoryServlet.java
===================================================================
--- src/server/trunk/server-webapp/src/main/java/org/jboss/portletswap/servlet/DirectoryServlet.java 2008-01-24 10:31:46 UTC (rev 219)
+++ src/server/trunk/server-webapp/src/main/java/org/jboss/portletswap/servlet/DirectoryServlet.java 2008-01-25 11:47:37 UTC (rev 220)
@@ -17,7 +17,6 @@
import javax.xml.parsers.ParserConfigurationException;
import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.common.util.Version;
//import org.jboss.portletswap.RepositoryService;
import org.jboss.portletswap.metadata.ResultModel;
import org.jboss.portletswap.metadata.ResultModelProvider;
@@ -82,7 +81,7 @@
((Category)category3).setId("3");
category3.setDisplayName(new LocalizedString("foobar"));
- Module module = new Module("Toto", new Version("", 1, 0, 0, new Version.Qualifier(Version.Qualifier.Prefix.ALPHA, Version.Qualifier.Suffix.SUFFIX_1), ""));
+ Module module = new Module("Toto");
Artifact artifact = new FileArtifact(Type.JSR168PORTLET, new File("/tmp"), new ByteArrayInputStream(new byte[0]));
module.addArtifact(artifact);
}
Modified: src/textClient/src/main/java/org/jboss/portletswap/textclient/TextClient.java
===================================================================
--- src/textClient/src/main/java/org/jboss/portletswap/textclient/TextClient.java 2008-01-24 10:31:46 UTC (rev 219)
+++ src/textClient/src/main/java/org/jboss/portletswap/textclient/TextClient.java 2008-01-25 11:47:37 UTC (rev 220)
@@ -39,8 +39,6 @@
import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.common.util.Version;
-import org.jboss.portal.common.util.Version.Qualifier;
import org.jboss.portletswap.DirectoryService;
import org.jboss.portletswap.PortletswapException;
import org.jboss.portletswap.RepositoryService;
@@ -238,8 +236,6 @@
System.exit(1);
}
- Version version = new Version("", 1, 0, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA), "");
-
System.out.println("Enter a category id:");
System.out.print("> ");
@@ -256,7 +252,7 @@
try
{
Category category = repositoryService.getCategory(categoryId);
- Module module = new Module(moduleName, version);
+ Module module = new Module(moduleName);
List<Category> categories = new ArrayList<Category>();
categories.add(category);
module.setCategories(categories);
@@ -346,22 +342,19 @@
public void populate() throws RepositoryException
{
- Version version1 = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.ALPHA), "");
- Module module1 = new Module("Module1", version1);
+ Module module1 = new Module("Module1");
FileArtifact fileArtifact1_1 = new FileArtifact(Type.JSR168PORTLET, null, null);
fileArtifact1_1.setDisplayName(new LocalizedString("Artifact 1:1", Locale.ENGLISH));
module1.addArtifact(fileArtifact1_1);
module1 = repositoryService.storeModule(module1);
- Version version2 = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.CR), "");
- Module module2 = new Module("Module2", version2);
+ Module module2 = new Module("Module2");
module2 = repositoryService.storeModule(module2);
- Version version3 = new Version("", 1, 0, 0, new Qualifier(Qualifier.Prefix.BETA), "");
- Module module3 = new Module("Module3", version3);
+ Module module3 = new Module("Module3");
module3 = repositoryService.storeModule(module3);
- Module module4 = new Module("Module4", version1);
+ Module module4 = new Module("Module4");
FileArtifact fileArtifact4_1 = new FileArtifact(Type.JSR168PORTLET, null, null);
fileArtifact4_1.setDisplayName(new LocalizedString("Artifact 4:1", Locale.ENGLISH));
module4.addArtifact(fileArtifact4_1);
@@ -370,7 +363,7 @@
module4.addArtifact(fileArtifact4_2);
module4 = repositoryService.storeModule(module4);
- Module module5 = new Module("Module5", version2);
+ Module module5 = new Module("Module5");
module5 = repositoryService.storeModule(module5);
Category rootCategory;
More information about the jboss-svn-commits
mailing list