[jboss-svn-commits] JBL Code SVN: r14824 - in labs/shotoku/trunk: shotoku-base/src/java/org/jboss/shotoku/service and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 3 06:36:05 EDT 2007
Author: adamw
Date: 2007-09-03 06:36:04 -0400 (Mon, 03 Sep 2007)
New Revision: 14824
Removed:
labs/shotoku/trunk/shotoku-admin/
Modified:
labs/shotoku/trunk/project.properties
labs/shotoku/trunk/shotoku-base-service/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java
labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuService.java
labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tools.java
labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagService.java
labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java
Log:
Deleting administrated services
Modified: labs/shotoku/trunk/project.properties
===================================================================
--- labs/shotoku/trunk/project.properties 2007-09-03 09:52:17 UTC (rev 14823)
+++ labs/shotoku/trunk/project.properties 2007-09-03 10:36:04 UTC (rev 14824)
@@ -7,7 +7,7 @@
#shotoku.subprojects.cms=base,base-service,files,jcr,svn
shotoku.subprojects.cms=base,base-service,svn
#shotoku.subprojects=${shotoku.subprojects.cms},aop,test,admin,tags,feeds,file-access,portal
-shotoku.subprojects=${shotoku.subprojects.cms},aop,admin,tags,feeds,file-access
+shotoku.subprojects=${shotoku.subprojects.cms},aop,tags,feeds,file-access
shotoku.jar.dest=${local.deploy.dir}/../lib/shotoku
Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuService.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuService.java 2007-09-03 09:52:17 UTC (rev 14823)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuService.java 2007-09-03 10:36:04 UTC (rev 14824)
@@ -21,13 +21,10 @@
*/
package org.jboss.shotoku.service;
-import java.util.Set;
-
/**
*
* @author Adam Warski (adamw at aster.pl)
*/
-public interface ShotokuService extends AdministratedService {
- public void addAdministratedService(AdministratedServiceGetter asg);
- public Set<AdministratedServiceGetter> getAdministratedServices();
+public interface ShotokuService {
+ public void create() throws Exception;
}
Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tools.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tools.java 2007-09-03 09:52:17 UTC (rev 14823)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tools.java 2007-09-03 10:36:04 UTC (rev 14824)
@@ -61,7 +61,6 @@
getContextClassLoader().loadClass(
"org.jboss.shotoku.service.ShotokuServiceImpl").newInstance();
instance.create();
- instance.start();
} else {
// Application server mode - creating a proxy to an mbean.
instance = (ShotokuService) MBeanProxyExt.create(
Modified: labs/shotoku/trunk/shotoku-base-service/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-base-service/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java 2007-09-03 09:52:17 UTC (rev 14823)
+++ labs/shotoku/trunk/shotoku-base-service/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java 2007-09-03 10:36:04 UTC (rev 14824)
@@ -27,11 +27,7 @@
import org.jboss.annotation.ejb.Service;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.tools.Constants;
-import org.jboss.shotoku.tools.ConcurrentSet;
-import org.jboss.shotoku.tools.ConcurrentHashSet;
-import org.jboss.shotoku.tools.Tools;
import org.apache.log4j.Logger;
-import java.util.Set;
/**
*
@@ -40,25 +36,21 @@
@Service(objectName=Constants.SHOTOKU_SERVICE_NAME)
@Local(ShotokuServiceLocal.class)
@Management(ShotokuService.class)
-public class ShotokuServiceImpl extends AdministratedServiceImpl
+public class ShotokuServiceImpl
implements ShotokuService, ShotokuServiceLocal {
- Logger log = Logger.getLogger(AdministratedService.class);
+ Logger log = Logger.getLogger(ShotokuService.class);
/*
* Service-handling functions.
*/
public void create() throws Exception {
- super.create();
-
/*
* Setting up content managers.
*/
ContentManager.setup();
log.info("ContentManager setup completed.");
-
- super.afterCreate();
}
public void start() throws Exception {
@@ -70,45 +62,4 @@
public void destroy() {
}
- /*
- * Update function.
- */
-
- public void update() {
- }
-
- /*
- * Description functions.
- */
-
- public AdministratedService getServiceInstance() {
- return Tools.getService();
- }
-
- public String getServiceId() {
- return "ShotokuService";
- }
-
- public String getServiceName() {
- return "Shotoku service";
- }
-
- public String getServiceDescription() {
- return null;
- }
-
- /*
- * Service administration.
- */
-
- private ConcurrentSet<AdministratedServiceGetter> services =
- new ConcurrentHashSet<AdministratedServiceGetter>();
-
- public void addAdministratedService(AdministratedServiceGetter asg) {
- services.add(asg);
- }
-
- public Set<AdministratedServiceGetter> getAdministratedServices() {
- return services;
- }
}
Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagService.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagService.java 2007-09-03 09:52:17 UTC (rev 14823)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagService.java 2007-09-03 10:36:04 UTC (rev 14824)
@@ -1,6 +1,5 @@
package org.jboss.shotoku.tags;
-import org.jboss.shotoku.service.AdministratedService;
import org.jboss.shotoku.tags.exceptions.TagAddException;
import org.jboss.shotoku.tags.exceptions.TagDeleteException;
import org.jboss.shotoku.tags.exceptions.TagGetException;
@@ -11,7 +10,7 @@
/**
* @author Adam Warski (adamw at aster.pl)
*/
-public interface TagService extends AdministratedService {
+public interface TagService {
public void addTag(Tag t) throws TagAddException;
public void deleteTag(Tag t) throws TagDeleteException;
@@ -161,4 +160,14 @@
* @return Number of subscribers (visits)
*/
public Integer getAllSubscribers(String author) throws TagGetException;
+
+ public void create() throws Exception;
+
+ public void start() throws Exception;
+
+ public void stop();
+
+ public void destroy();
+
+ public void update();
}
Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2007-09-03 09:52:17 UTC (rev 14823)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2007-09-03 10:36:04 UTC (rev 14824)
@@ -36,10 +36,7 @@
import org.jboss.annotation.ejb.Depends;
import org.jboss.shotoku.tools.Constants;
import org.jboss.shotoku.tools.Tools;
-import org.jboss.shotoku.service.AdministratedServiceImpl;
-import org.jboss.shotoku.service.AdministratedService;
import org.jboss.shotoku.tags.*;
-import org.jboss.shotoku.tags.tools.TagTools;
import org.jboss.shotoku.tags.tools.FeedType;
import org.jboss.shotoku.tags.exceptions.TagGetException;
import org.jboss.shotoku.tags.exceptions.TagAddException;
@@ -48,6 +45,8 @@
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.Resource;
import org.jboss.shotoku.Node;
+import org.jboss.shotoku.cache.CacheItem;
+import org.jboss.shotoku.cache.CacheItemUser;
import org.jboss.shotoku.exceptions.SaveException;
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
@@ -59,10 +58,9 @@
@Local(TagServiceLocal.class)
@Management(TagService.class)
@Depends(Constants.SHOTOKU_SERVICE_NAME)
-public class TagServiceImpl extends AdministratedServiceImpl implements
- TagService, TagServiceLocal {
+public class TagServiceImpl implements TagService, TagServiceLocal {
private static final Logger log = Logger
- .getLogger(AdministratedService.class);
+ .getLogger(TagService.class);
private boolean syncOn;
@@ -70,15 +68,17 @@
@PersistenceUnit
private EntityManagerFactory emf;
+
+ private CacheItemUser<Object, Object> tagci;
/*
* Service lifecycle management.
*/
public void create() throws Exception {
- super.create();
-
- setTimerInterval(ContentManager.getProperty(
+ tagci = CacheItem.create(new TagCacheItemDataSource(this));
+
+ tagci.setInterval(ContentManager.getProperty(
org.jboss.shotoku.tags.tools.Constants.PROPERTY_INTERVAL,
10000));
@@ -90,17 +90,17 @@
Constants.DEFAULT_ID), ContentManager.getProperty(
org.jboss.shotoku.tags.tools.Constants.PROPERTY_CMDIR, ""));
}
-
- super.afterCreate();
}
public void start() throws Exception {
- super.start();
- startUpdateThread();
- log.info("Tag service started with update interval: "
- + getTimerInterval());
+ tagci.get(new Object());
+ log.info("Tag service started.");
}
+ public void stop() {
+
+ }
+
public void destroy() {
}
@@ -183,22 +183,6 @@
}
}
- public String getServiceId() {
- return "ShotokuTagService";
- }
-
- public String getServiceName() {
- return "Tag service";
- }
-
- public String getServiceDescription() {
- return "Shotoku tag service";
- }
-
- public AdministratedService getServiceInstance() {
- return TagTools.getService();
- }
-
/*
* TagService implementation.
*/
More information about the jboss-svn-commits
mailing list