[jboss-svn-commits] JBL Code SVN: r5800 - in labs/shotoku/branches/qa: . shotoku-base/src/etc shotoku-tags/src/java/org/jboss/shotoku/tags shotoku-tags/src/java/org/jboss/shotoku/tags/service shotoku-user
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Aug 11 15:41:57 EDT 2006
Author: szimano
Date: 2006-08-11 15:41:56 -0400 (Fri, 11 Aug 2006)
New Revision: 5800
Modified:
labs/shotoku/branches/qa/project.properties
labs/shotoku/branches/qa/shotoku-base/src/etc/shotoku.properties.sample
labs/shotoku/branches/qa/shotoku-tags/src/java/org/jboss/shotoku/tags/DummyTag.java
labs/shotoku/branches/qa/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java
labs/shotoku/branches/qa/shotoku-user/shotoku-user.iml
Log:
svn merge -r 5614:5799 http://anonsvn.labs.jboss.com/labs/shotoku/trunk .
tag feeds problems
Modified: labs/shotoku/branches/qa/project.properties
===================================================================
--- labs/shotoku/branches/qa/project.properties 2006-08-11 19:39:29 UTC (rev 5799)
+++ labs/shotoku/branches/qa/project.properties 2006-08-11 19:41:56 UTC (rev 5800)
@@ -5,7 +5,7 @@
shotoku.sar.dir=shotoku.sar
shotoku.subprojects.cms=base,files,jcr,svn
-shotoku.subprojects=${shotoku.subprojects.cms},aop,test,user,web,admin,tags,feeds,file-access
+shotoku.subprojects=${shotoku.subprojects.cms},aop,test,user,web,admin,tags,feeds,file-access,portal
maven.final.name=${pom.artifactId}
Modified: labs/shotoku/branches/qa/shotoku-base/src/etc/shotoku.properties.sample
===================================================================
--- labs/shotoku/branches/qa/shotoku-base/src/etc/shotoku.properties.sample 2006-08-11 19:39:29 UTC (rev 5799)
+++ labs/shotoku/branches/qa/shotoku-base/src/etc/shotoku.properties.sample 2006-08-11 19:41:56 UTC (rev 5800)
@@ -11,7 +11,7 @@
shotoku.default.localpath =
shotoku.default.fullupdate = 1
# Should externals be checked out during an update of the WC.
-shotoku.default.externals = 1
+shotoku.default.externals = true
# shotoku.file.implementation = org.jboss.shotoku.files.FileContentManager
# shotoku.file.localpath =
Modified: labs/shotoku/branches/qa/shotoku-tags/src/java/org/jboss/shotoku/tags/DummyTag.java
===================================================================
--- labs/shotoku/branches/qa/shotoku-tags/src/java/org/jboss/shotoku/tags/DummyTag.java 2006-08-11 19:39:29 UTC (rev 5799)
+++ labs/shotoku/branches/qa/shotoku-tags/src/java/org/jboss/shotoku/tags/DummyTag.java 2006-08-11 19:41:56 UTC (rev 5800)
@@ -6,12 +6,16 @@
* @author Adam Warski (adamw at aster.pl)
*/
public class DummyTag extends AbstractTag {
+ private String type;
+
public DummyTag(String name, String author, String resourceId,
- String data, Date dateCreated) {
+ String data, Date dateCreated, String type) {
super(name, author, resourceId, data, dateCreated);
+
+ this.type = type;
}
public String getType() {
- return "";
+ return type;
}
}
Modified: labs/shotoku/branches/qa/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java
===================================================================
--- labs/shotoku/branches/qa/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-08-11 19:39:29 UTC (rev 5799)
+++ labs/shotoku/branches/qa/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-08-11 19:41:56 UTC (rev 5800)
@@ -340,7 +340,7 @@
EntityManager manager = emf.createEntityManager();
try {
StringBuffer querySb = new StringBuffer(
- "SELECT name, resourceId, min(dateCreated) "
+ "SELECT name, resourceId, min(dateCreated), type "
+ "FROM TagEntity WHERE ");
int i = 0;
for (Iterator iter = tagNames.iterator(); iter.hasNext();) {
@@ -355,7 +355,7 @@
i++;
}
- querySb.append(" GROUP BY name, resourceId");
+ querySb.append(" GROUP BY name, resourceId, type");
Query query = manager.createQuery(querySb.toString());
i = 0;
@@ -369,7 +369,7 @@
List<Tag> ret = new ArrayList<Tag>();
for (Object[] o : result) {
ret.add(new DummyTag((String) o[0], null, (String) o[1], null,
- (Date) o[2]));
+ (Date) o[2], (String) o[3]));
}
sortTagsByDate(ret);
@@ -473,15 +473,15 @@
try {
// noinspection unchecked
List<Object[]> result = manager.createQuery(
- "SELECT name, min(dateCreated) FROM TagEntity "
- + "WHERE author = :author " + "GROUP BY name") // +
+ "SELECT name, min(dateCreated), type FROM TagEntity "
+ + "WHERE author = :author " + "GROUP BY name, type") // +
// "ORDER BY mdc DESC")
.setParameter("author", author).getResultList();
List<Tag> ret = new ArrayList<Tag>();
for (Object[] o : result) {
ret.add(new DummyTag((String) o[0], author, null, null,
- (Date) o[1]));
+ (Date) o[1], (String) o[2]));
}
sortTagsByDate(ret);
@@ -525,16 +525,16 @@
try {
// noinspection unchecked
List<Object[]> result = manager.createQuery(
- "SELECT name, min(dateCreated) FROM TagEntity "
+ "SELECT name, min(dateCreated), type FROM TagEntity "
+ "WHERE resourceId = :resourceId "
- + "GROUP BY name") // +
+ + "GROUP BY name, type") // +
// "ORDER BY min(dateCreated) DESC")
.setParameter("resourceId", resourceId).getResultList();
List<Tag> ret = new ArrayList<Tag>();
for (Object[] o : result) {
ret.add(new DummyTag((String) o[0], null, resourceId, null,
- (Date) o[1]));
+ (Date) o[1], (String) o[2]));
}
sortTagsByDate(ret);
Modified: labs/shotoku/branches/qa/shotoku-user/shotoku-user.iml
===================================================================
--- labs/shotoku/branches/qa/shotoku-user/shotoku-user.iml 2006-08-11 19:39:29 UTC (rev 5799)
+++ labs/shotoku/branches/qa/shotoku-user/shotoku-user.iml 2006-08-11 19:41:56 UTC (rev 5800)
@@ -10,9 +10,9 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="portal" level="application" />
- <orderEntry type="library" name="jboss" level="application" />
<orderEntry type="module" module-name="shotoku-aop" />
<orderEntry type="module" module-name="shotoku-base" />
+ <orderEntry type="library" name="jboss" level="application" />
<orderEntryProperties />
</component>
</module>
More information about the jboss-svn-commits
mailing list