Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4796 - in labs/shotoku/branches/prod: shotoku-admin/src/web/WEB-INF shotoku-aop/src/java/org/jboss/shotoku/aop shotoku-base/src/java/org/jboss/shotoku/service shotoku-base/src/java/org/jboss/shotoku/tools shotoku-file-access/src/java/org/jboss/shotoku/fileaccess shotoku-tags/src/java/org/jboss/shotoku/tags shotoku-tags/src/java/org/jboss/shotoku/tags/service
Author: dam...@jb... Date: 2006-06-21 14:48:28 -0400 (Wed, 21 Jun 2006) New Revision: 4796 Added: labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/service/Null.java Modified: labs/shotoku/branches/prod/shotoku-admin/src/web/WEB-INF/web.xml labs/shotoku/branches/prod/shotoku-aop/src/java/org/jboss/shotoku/aop/CacheInjectAspect.java labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/tools/Pair.java labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/tools/Triple.java labs/shotoku/branches/prod/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java labs/shotoku/branches/prod/shotoku-tags/src/java/org/jboss/shotoku/tags/AbstractTag.java labs/shotoku/branches/prod/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java Log: MERGED: r 4784:4794 https://svn.labs.jboss.com/labs/shotoku/branches/qa into prod shotoku for Labs 1.1-SP1 release. Modified: labs/shotoku/branches/prod/shotoku-admin/src/web/WEB-INF/web.xml =================================================================== --- labs/shotoku/branches/prod/shotoku-admin/src/web/WEB-INF/web.xml 2006-06-21 18:48:03 UTC (rev 4795) +++ labs/shotoku/branches/prod/shotoku-admin/src/web/WEB-INF/web.xml 2006-06-21 18:48:28 UTC (rev 4796) @@ -47,7 +47,7 @@ <security-constraint> <web-resource-collection> <web-resource-name>All resources</web-resource-name> - <url-pattern>/admin/*</url-pattern> + <url-pattern>/*</url-pattern> </web-resource-collection> <auth-constraint> <role-name>ShotokuAdmin</role-name> Modified: labs/shotoku/branches/prod/shotoku-aop/src/java/org/jboss/shotoku/aop/CacheInjectAspect.java =================================================================== --- labs/shotoku/branches/prod/shotoku-aop/src/java/org/jboss/shotoku/aop/CacheInjectAspect.java 2006-06-21 18:48:03 UTC (rev 4795) +++ labs/shotoku/branches/prod/shotoku-aop/src/java/org/jboss/shotoku/aop/CacheInjectAspect.java 2006-06-21 18:48:28 UTC (rev 4796) @@ -32,30 +32,35 @@ */ @Aspect(scope=Scope.PER_JOINPOINT) public class CacheInjectAspect { - ShotokuCacheItem sci; + private final static Object synchronizer = new Object(); + private ShotokuCacheItem sci; private CacheItem getCurrentAnnotation(FieldInvocation invocation) { - CacheItem current = invocation.getField().getAnnotation(CacheItem.class); - if (current == null) - throw new RuntimeException("This aspect should be used only with " + - "@CacheItem!"); + CacheItem current = invocation.getField().getAnnotation(CacheItem.class); + if (current == null) + throw new RuntimeException("This aspect should be used only with " + + "@CacheItem!"); - return current; - } + return current; + } @Bind(pointcut="field($instanceof{org.jboss.shotoku.cache.ShotokuCacheItem} " + "*->@org.jboss.shotoku.aop.CacheItem)") public Object accessCacheItem(FieldReadInvocation invocation) throws Throwable { if (sci == null) { - CacheItem ci = getCurrentAnnotation(invocation); + synchronized(synchronizer) { + if (sci == null) { + CacheItem ci = getCurrentAnnotation(invocation); - if (ci.interval() == 0) { - sci = (ShotokuCacheItem) - invocation.getField().getType().getConstructor().newInstance(); - } else { - sci = (ShotokuCacheItem) - invocation.getField().getType().getConstructor(Long.TYPE).newInstance( - ci.interval()); + if (ci.interval() == 0) { + sci = (ShotokuCacheItem) + invocation.getField().getType().getConstructor().newInstance(); + } else { + sci = (ShotokuCacheItem) + invocation.getField().getType().getConstructor(Long.TYPE).newInstance( + ci.interval()); + } + } } } Copied: labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/service/Null.java (from rev 4794, labs/shotoku/branches/qa/shotoku-base/src/java/org/jboss/shotoku/service/Null.java) Modified: labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java =================================================================== --- labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java 2006-06-21 18:48:03 UTC (rev 4795) +++ labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java 2006-06-21 18:48:28 UTC (rev 4796) @@ -130,11 +130,20 @@ new ConcurrentHashSet<ShotokuCacheItem>(); public Object get(Object key) { - return cache.get(key); + Object ret = cache.get(key); + if (Null.getInstance().equals(ret)) { + return null; + } else { + return ret; + } } public void put(Object key, Object o) { - cache.put(key, o); + if (o == null) { + cache.put(key, Null.getInstance()); + } else { + cache.put(key, o); + } } public void remove(Object key) { @@ -183,7 +192,21 @@ } public String getServiceDescription() { - return "Cache service."; + StringBuffer sb = new StringBuffer("Cache service.<br />"); + sb.append("Currently storing ").append(cache.size()).append(" items in the cache "); + sb.append("and ").append(cacheItems.size()).append(" ShotokuCacheItem objects.<br />"); + sb.append("Objects in cache:<br />"); + for (Object key : cache.keySet()) { + sb.append(key.toString()).append(" : ").append( + cache.get(key).getClass().getName()).append("<br />"); + } + + sb.append("Cache items:<br />"); + for (ShotokuCacheItem sci : cacheItems) { + sb.append(sci.getClass().getName()).append("<br />"); + } + + return sb.toString(); } /* Modified: labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/tools/Pair.java =================================================================== --- labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/tools/Pair.java 2006-06-21 18:48:03 UTC (rev 4795) +++ labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/tools/Pair.java 2006-06-21 18:48:28 UTC (rev 4796) @@ -56,4 +56,8 @@ public int hashCode() { return obj1.hashCode() + obj2.hashCode(); } + + public String toString() { + return "(" + obj1.toString() + ", " + obj2.toString() + ")"; + } } Modified: labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/tools/Triple.java =================================================================== --- labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/tools/Triple.java 2006-06-21 18:48:03 UTC (rev 4795) +++ labs/shotoku/branches/prod/shotoku-base/src/java/org/jboss/shotoku/tools/Triple.java 2006-06-21 18:48:28 UTC (rev 4796) @@ -43,4 +43,8 @@ public int hashCode() { return obj1.hashCode() + obj2.hashCode() + obj3.hashCode(); } + + public String toString() { + return "(" + obj1.toString() + ", " + obj2.toString()+ ", " + obj3.toString() + ")"; + } } Modified: labs/shotoku/branches/prod/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java =================================================================== --- labs/shotoku/branches/prod/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java 2006-06-21 18:48:03 UTC (rev 4795) +++ labs/shotoku/branches/prod/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java 2006-06-21 18:48:28 UTC (rev 4796) @@ -49,7 +49,7 @@ private void writeErrorMessage(HttpServletResponse response) throws IOException { response.setContentType("text/html"); - response.getWriter().println(FileAccessServlet.ACCESS_DENIED); + response.getOutputStream().println(FileAccessServlet.ACCESS_DENIED); } protected void doGet(HttpServletRequest request, HttpServletResponse response) @@ -105,8 +105,11 @@ try { Tools.transfer(ci.getIs(), os); } finally { - os.close(); - ci.getIs().close(); + try { + os.close(); + } finally { + ci.getIs().close(); + } } } catch (Exception e) { log.info("Unable to send a file.", e); Modified: labs/shotoku/branches/prod/shotoku-tags/src/java/org/jboss/shotoku/tags/AbstractTag.java =================================================================== --- labs/shotoku/branches/prod/shotoku-tags/src/java/org/jboss/shotoku/tags/AbstractTag.java 2006-06-21 18:48:03 UTC (rev 4795) +++ labs/shotoku/branches/prod/shotoku-tags/src/java/org/jboss/shotoku/tags/AbstractTag.java 2006-06-21 18:48:28 UTC (rev 4796) @@ -8,43 +8,64 @@ * @author Adam Warski (ad...@as...) */ public abstract class AbstractTag implements Tag { - private String name; - private String author; - private String resourceId; - private String data; + private String name; - private Date dateCreated; + private String author; - public AbstractTag(String name, String author, String resourceId, - String data, Date dateCreated) { - this.name = name; - this.author = author; - this.resourceId = resourceId; - this.data = data; - this.dateCreated = dateCreated; - } + private String resourceId; - /* - * TAG implementation. - */ + private String data; - public String getName() { - return name; - } + private Date dateCreated; - public String getAuthor() { - return author; - } + public AbstractTag(String name, String author, String resourceId, + String data, Date dateCreated) { + this.name = name; + this.author = author; + this.resourceId = resourceId; + this.data = data; + this.dateCreated = dateCreated; + } - public String getResourceId() { - return resourceId; - } + /* + * TAG implementation. + */ - public String getData() { - return data; - } + public String getName() { + return name; + } - public Date getDateCreated() { - return dateCreated; - } -} + public String getAuthor() { + return author; + } + + public String getResourceId() { + return resourceId; + } + + public String getData() { + return data; + } + + public Date getDateCreated() { + return dateCreated; + } + +public boolean equals(Object obj) { + if (obj == null) { + return false; + } + + if (obj.getClass().equals(this.getClass())) { + AbstractTag otherTag = (AbstractTag) obj; + + if (name.equals(otherTag.getName()) + && ((data == null && otherTag.getData() == null) || (data != null && data.equals(otherTag.getData()))) + && resourceId.equals(otherTag.getResourceId()) + && author.equals(otherTag.getAuthor())) { + return true; + } + } + + return false; + }} Modified: labs/shotoku/branches/prod/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java =================================================================== --- labs/shotoku/branches/prod/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-06-21 18:48:03 UTC (rev 4795) +++ labs/shotoku/branches/prod/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-06-21 18:48:28 UTC (rev 4796) @@ -22,9 +22,11 @@ package org.jboss.shotoku.tags.service; import java.util.Calendar; +import java.util.HashMap; import java.util.List; import java.util.ArrayList; import java.util.Iterator; +import java.util.Map; import java.net.URLEncoder; import java.io.UnsupportedEncodingException; @@ -54,246 +56,310 @@ * @author Adam Warski (ad...@as...) * @author Damon Sicore (da...@si...) */ -@Service(objectName=org.jboss.shotoku.tags.tools.Constants.TAG_SERVICE_NAME) +@Service(objectName = org.jboss.shotoku.tags.tools.Constants.TAG_SERVICE_NAME) @Local(TagServiceLocal.class) @Management(TagService.class) @Depends(Constants.SHOTOKU_SERVICE_NAME) -public class TagServiceImpl extends AdministratedServiceImpl - implements TagService, TagServiceLocal { - private static final Logger log = Logger.getLogger(TagService.class); +public class TagServiceImpl extends AdministratedServiceImpl implements + TagService, TagServiceLocal { + private static final Logger log = Logger.getLogger(TagService.class); - /* - * Service lifecycle management. - */ + /* + * Service lifecycle management. + */ - public void create() throws Exception { - super.create(); + public void create() throws Exception { + super.create(); - // Enabling administration for this service. - Tools.getService().addAdministratedService(new AdministratedServiceGetter() { - public AdministratedService getService() { - return TagTools.getService(); - } - }); + // Enabling administration for this service. + Tools.getService().addAdministratedService( + new AdministratedServiceGetter() { + public AdministratedService getService() { + return TagTools.getService(); + } + }); - setTimerInterval(10000); + setTimerInterval(10000); - log.info("Tag service created."); - } + log.info("Tag service created."); + } - public void start() throws Exception { - super.start(); + public void start() throws Exception { + super.start(); - // Starting the updater thread. - new Thread() { - { - setDaemon(true); - } + // Starting the updater thread. + new Thread() { + { + setDaemon(true); + } - public void run() { - while (getServiceRunnable()) { - try { - sleep(getTimerInterval()); - } catch (InterruptedException e) { - e.printStackTrace(); - } + public void run() { + while (getServiceRunnable()) { + try { + sleep(getTimerInterval()); + } catch (InterruptedException e) { + e.printStackTrace(); + } - try { - update(); - } catch (Throwable t) { - // Making sure that an exception won't stop the thread. - } + try { + update(); + } catch (Throwable t) { + // Making sure that an exception won't stop the thread. + } - setLastUpdate(Calendar.getInstance().getTimeInMillis()); - } + setLastUpdate(Calendar.getInstance().getTimeInMillis()); + } - log.info("Tag service deaemon thread terminated."); - } - }.start(); + log.info("Tag service deaemon thread terminated."); + } + }.start(); - log.info("Tag service started with update interval: "+ getTimerInterval()); - } + log.info("Tag service started with update interval: " + + getTimerInterval()); + } - public void stop() { - super.stop(); - log.info("Tag service signaled to stop."); - } + public void stop() { + super.stop(); + log.info("Tag service signaled to stop."); + } - public void destroy() { - } + public void destroy() { + } - /* - * Timer-handling functions. - */ + /* + * Timer-handling functions. + */ - public void update() { + public void update() { - } + } - public String getServiceId() { - return "ShotokuTagService"; - } + public String getServiceId() { + return "ShotokuTagService"; + } - public String getServiceName() { - return "Tag service"; - } + public String getServiceName() { + return "Tag service"; + } - public String getServiceDescription() { - return "Shotoku tag service"; - } + public String getServiceDescription() { + return "Shotoku tag service"; + } - /* - * TagService implementation. - */ + /* + * TagService implementation. + */ - @PersistenceContext - private EntityManager manager; + @PersistenceContext + private EntityManager manager; - private TagEntity getTagEntity(Tag t) { - TagEntity te = new TagEntity(); + /** + * MIN_SIMILARITY - minimal similarity for checking relatedTags needed + */ + private double MIN_SIMILARITY = 0.7d; - te.setAuthor(t.getAuthor()); - te.setData(t.getData()); - te.setDateCreated(t.getDateCreated()); - te.setName(t.getName()); - te.setResourceId(t.getResourceId()); - te.setType(t.getType()); + private TagEntity getTagEntity(Tag t) { + TagEntity te = new TagEntity(); - return te; - } + te.setAuthor(t.getAuthor()); + te.setData(t.getData()); + te.setDateCreated(t.getDateCreated()); + te.setName(t.getName()); + te.setResourceId(t.getResourceId()); + te.setType(t.getType()); - public void addTag(Tag t) throws TagAddException { - try { - manager.persist(getTagEntity(t)); - } catch (Throwable e) { - throw new TagAddException(e); - } - } + return te; + } - public void deleteTag(Tag t) throws TagDeleteException { - try { - manager.remove(getTagEntity(t)); - } catch (Throwable e) { - throw new TagDeleteException(e); - } - } + public void addTag(Tag t) throws TagAddException { + try { + manager.persist(getTagEntity(t)); + } catch (Throwable e) { + throw new TagAddException(e); + } + } - public List<Tag> getTags(String resourceId) throws TagGetException { - try { - //noinspection unchecked - List<TagEntity> result = manager.createQuery( - "from TagEntity where resourceId = :resourceId order by dateCreated desc"). - setParameter("resourceId", resourceId).getResultList(); + public void deleteTag(Tag t) throws TagDeleteException { + try { + manager.remove(getTagEntity(t)); + } catch (Throwable e) { + throw new TagDeleteException(e); + } + } - List<Tag> ret = new ArrayList<Tag>(); - for (TagEntity te : result) { - ret.add(te.getTag()); - } + public List<Tag> getTags(String resourceId) throws TagGetException { + try { + // noinspection unchecked + List<TagEntity> result = manager + .createQuery( + "from TagEntity where resourceId = :resourceId order by dateCreated desc") + .setParameter("resourceId", resourceId).getResultList(); - return ret; - } catch (Throwable e) { - throw new TagGetException(e); - } - } + List<Tag> ret = new ArrayList<Tag>(); + for (TagEntity te : result) { + ret.add(te.getTag()); + } - public Tag getTag(String tagName) throws TagGetException { - try { - //noinspection unchecked - TagEntity result = (TagEntity) manager.createQuery("from TagEntity where name = :name"). - setParameter("name", tagName).getSingleResult(); + return ret; + } catch (Throwable e) { + throw new TagGetException(e); + } + } - if (result == null) { - return null; - } + public Tag getTag(String tagName) throws TagGetException { + try { + // noinspection unchecked + TagEntity result = (TagEntity) manager.createQuery( + "from TagEntity where name = :name").setParameter("name", + tagName).getSingleResult(); - return result.getTag(); - } catch (Throwable e) { - throw new TagGetException(e); - } - } + if (result == null) { + return null; + } - public List<Tag> getTags(List<String> tagNames) throws TagGetException { - try { - StringBuffer querySb = new StringBuffer("from TagEntity where "); - int i = 0; - for (Iterator iter = tagNames.iterator(); iter.hasNext();) { - querySb.append("name").append(" = :name").append(i); + return result.getTag(); + } catch (Throwable e) { + throw new TagGetException(e); + } + } - iter.next(); + public List<Tag> getTags(List<String> tagNames) throws TagGetException { + try { + StringBuffer querySb = new StringBuffer("from TagEntity where "); + int i = 0; + for (Iterator iter = tagNames.iterator(); iter.hasNext();) { + querySb.append("name").append(" = :name").append(i); - if (iter.hasNext()) { - querySb.append(" and "); - } + iter.next(); - i++; - } + if (iter.hasNext()) { + querySb.append(" and "); + } - Query query = manager.createQuery(querySb.toString()); - i = 0; - for (String tagName : tagNames) { - query.setParameter("name" + i++, tagName); - } + i++; + } - //noinspection unchecked - List<TagEntity> result = query.getResultList(); + Query query = manager.createQuery(querySb.toString()); + i = 0; + for (String tagName : tagNames) { + query.setParameter("name" + i++, tagName); + } - List<Tag> ret = new ArrayList<Tag>(); - for (TagEntity te : result) { - ret.add(te.getTag()); - } + // noinspection unchecked + List<TagEntity> result = query.getResultList(); - return ret; - } catch (Throwable e) { - throw new TagGetException(e); - } - } + List<Tag> ret = new ArrayList<Tag>(); + for (TagEntity te : result) { + ret.add(te.getTag()); + } - public List<Tag> getRelatedTags(List<Tag> relateTo) throws TagGetException { - return null; - } + return ret; + } catch (Throwable e) { + throw new TagGetException(e); + } + } - public List<Tag> getTagsByAuthor(String author) throws TagGetException { - try { - //noinspection unchecked - List<TagEntity> result = manager.createQuery( - "from TagEntity where author = :author order by dateCreated desc"). - setParameter("author", author).getResultList(); + public List<Tag> getRelatedTags(List<Tag> relateTo) throws TagGetException { + List<Tag> ret = new ArrayList<Tag>(); - List<Tag> ret = new ArrayList<Tag>(); - for (TagEntity te : result) { - ret.add(te.getTag()); - } + Map<String, List<Tag>> otherResources = new HashMap<String, List<Tag>>(); - return ret; - } catch (Throwable e) { - throw new TagGetException(e); - } - } + for (Tag relatedTag : relateTo) { + List<TagEntity> result = manager.createQuery( + "from TagEntity where name = :name").setParameter("name", + relatedTag.getName()).getResultList(); - public String getFeedLink(FeedType feedType, String data, String type) { - try { - return "/feeds/tag/" + feedType.toString() + "/" + - URLEncoder.encode(data, "UTF-8") + "/" + type; - } catch (UnsupportedEncodingException e) { - return ""; - } - } + for (TagEntity otherTag : result) { + if (!otherResources.containsKey(otherTag.getResourceId())) { + otherResources.put(otherTag.getResourceId(), + getTags(otherTag.getResourceId())); + } + } + } - public String getFeedLink(FeedType feedType, List<String> dataList, String type) { - StringBuffer sb = new StringBuffer(); + for (List<Tag> tagList : otherResources.values()) { + if (checkSimilarity(relateTo, tagList) >= MIN_SIMILARITY) { + ret.addAll(tagList); + } + } - for (Iterator<String> iter = dataList.iterator(); iter.hasNext();) { - sb.append(iter.next()); - if (iter.hasNext()) { - sb.append("+"); - } - } + // don't return "relateTo" members + List<Tag> endRet = new ArrayList<Tag>(ret); + for (Tag tag : ret) { + if (tagListContainsTag(tag, relateTo)) { + endRet.remove(tag); + } + } + + return endRet; + } + + private boolean tagListContainsTag(Tag tag, List<Tag> listToCheck) { + for (Tag tag2 : listToCheck) { + if (tag.getName().equals(tag2.getName())) { + return true; + } + } + + return false; + } - try { - return "/feeds/tag/" + feedType.toString() + "/" + - URLEncoder.encode(sb.toString(), "UTF-8") + "/" + type; - } catch (UnsupportedEncodingException e) { - return ""; - } - } + private double checkSimilarity(List<Tag> givenTags, List<Tag> listToCheck) { + double ret = 0; + + for (Tag tag : givenTags) { + if (tagListContainsTag(tag,listToCheck)) { + ret++; + } + } + + return ret / (double) givenTags.size(); + } + + public List<Tag> getTagsByAuthor(String author) throws TagGetException { + try { + // noinspection unchecked + List<TagEntity> result = manager + .createQuery( + "from TagEntity where author = :author order by dateCreated desc") + .setParameter("author", author).getResultList(); + + List<Tag> ret = new ArrayList<Tag>(); + for (TagEntity te : result) { + ret.add(te.getTag()); + } + + return ret; + } catch (Throwable e) { + throw new TagGetException(e); + } + } + + public String getFeedLink(FeedType feedType, String data, String type) { + try { + return "/feeds/tag/" + feedType.toString() + "/" + + URLEncoder.encode(data, "UTF-8") + "/" + type; + } catch (UnsupportedEncodingException e) { + return ""; + } + } + + public String getFeedLink(FeedType feedType, List<String> dataList, + String type) { + StringBuffer sb = new StringBuffer(); + + for (Iterator<String> iter = dataList.iterator(); iter.hasNext();) { + sb.append(iter.next()); + if (iter.hasNext()) { + sb.append("+"); + } + } + + try { + return "/feeds/tag/" + feedType.toString() + "/" + + URLEncoder.encode(sb.toString(), "UTF-8") + "/" + type; + } catch (UnsupportedEncodingException e) { + return ""; + } + } } |
