hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-247] Adjust location of UsageEvents to not be part of old statistics package.

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@4430 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Mark Diggory
2009-10-10 17:21:30 +00:00
parent 485cc48e2a
commit b1d9b5306a
16 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/app/statistics/AbstractUsageEventListener.java → dspace-api/src/main/java/org/dspace/usage/AbstractUsageEventListener.java
View File

@@ -34,7 +34,7 @@
* DAMAGE.
*/
package org.dspace.app.statistics;
package org.dspace.usage;
import org.dspace.services.EventService;
import org.dspace.services.model.EventListener;

4
dspace-api/src/main/java/org/dspace/app/statistics/LoggerUsageEventListener.java → dspace-api/src/main/java/org/dspace/usage/LoggerUsageEventListener.java
View File

@@ -34,15 +34,15 @@
* DAMAGE.
*/
package org.dspace.app.statistics;
package org.dspace.usage;
import org.apache.log4j.Logger;
import org.dspace.app.statistics.UsageEvent.Action;
import org.dspace.content.DSpaceObject;
import org.dspace.content.Item;
import org.dspace.core.Constants;
import org.dspace.core.LogManager;
import org.dspace.services.model.Event;
import org.dspace.usage.UsageEvent.Action;
/**
*

2
dspace-api/src/main/java/org/dspace/app/statistics/PassiveUsageEventListener.java → dspace-api/src/main/java/org/dspace/usage/PassiveUsageEventListener.java
View File

@@ -34,7 +34,7 @@
* DAMAGE.
*/
package org.dspace.app.statistics;
package org.dspace.usage;
import org.dspace.services.model.Event;

2
dspace-api/src/main/java/org/dspace/app/statistics/TabFileUsageEventListener.java → dspace-api/src/main/java/org/dspace/usage/TabFileUsageEventListener.java
View File

@@ -34,7 +34,7 @@
* DAMAGE.
*/
package org.dspace.app.statistics;
package org.dspace.usage;
import java.io.File;
import java.io.FileNotFoundException;

2
dspace-api/src/main/java/org/dspace/app/statistics/UsageEvent.java → dspace-api/src/main/java/org/dspace/usage/UsageEvent.java
View File

@@ -34,7 +34,7 @@
* DAMAGE.
*/
package org.dspace.app.statistics;
package org.dspace.usage;
import javax.servlet.http.HttpServletRequest;

2
dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/BitstreamServlet.java
View File

@@ -54,7 +54,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
import org.dspace.app.statistics.UsageEvent;
import org.dspace.app.webui.util.JSPManager;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Bitstream;
@@ -68,6 +67,7 @@ import org.dspace.core.LogManager;
import org.dspace.core.Utils;
import org.dspace.handle.HandleManager;
import org.dspace.services.model.Event;
import org.dspace.usage.UsageEvent;
import org.dspace.utils.DSpace;
/**

2
dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/HTMLServlet.java
View File

@@ -49,7 +49,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
import org.dspace.app.statistics.UsageEvent;
import org.dspace.app.webui.util.JSPManager;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Bitstream;
@@ -62,6 +61,7 @@ import org.dspace.core.LogManager;
import org.dspace.core.Utils;
import org.dspace.handle.HandleManager;
import org.dspace.services.model.Event;
import org.dspace.usage.UsageEvent;
import org.dspace.utils.DSpace;
/**

2
dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/HandleServlet.java
View File

@@ -51,7 +51,6 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.log4j.Logger;
import org.dspace.app.statistics.UsageEvent;
import org.dspace.app.webui.util.Authenticate;
import org.dspace.app.webui.util.JSPManager;
import org.dspace.app.webui.util.UIUtil;
@@ -75,6 +74,7 @@ import org.dspace.eperson.Subscribe;
import org.dspace.handle.HandleManager;
import org.dspace.plugin.CollectionHomeProcessor;
import org.dspace.plugin.CommunityHomeProcessor;
import org.dspace.usage.UsageEvent;
import org.dspace.utils.DSpace;
import org.jdom.Element;
import org.jdom.Text;

2
dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/RetrieveServlet.java
View File

@@ -48,7 +48,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
import org.dspace.app.statistics.UsageEvent;
import org.dspace.app.webui.util.JSPManager;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Bitstream;
@@ -56,6 +55,7 @@ import org.dspace.core.Constants;
import org.dspace.core.Context;
import org.dspace.core.LogManager;
import org.dspace.core.Utils;
import org.dspace.usage.UsageEvent;
import org.dspace.utils.DSpace;
/**

2
dspace-jspui/dspace-jspui-webapp/src/main/webapp/WEB-INF/spring/applicationContext.xml
View File

@@ -13,7 +13,7 @@
<bean id="dspace.eventService" factory-bean="dspace" factory-method="getEventService"/>
<!-- Inject the Default LoggerUsageEventListener into the EventService -->
<bean class="org.dspace.app.statistics.LoggerUsageEventListener">
<bean class="org.dspace.usage.LoggerUsageEventListener">
<property name="eventService" >
<ref bean="dspace.eventService"/>
</property>

2
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java
View File

@@ -49,7 +49,6 @@ import org.apache.cocoon.environment.Request;
import org.apache.cocoon.util.HashUtil;
import org.apache.excalibur.source.SourceValidity;
import org.apache.log4j.Logger;
import org.dspace.app.statistics.UsageEvent;
import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
import org.dspace.app.xmlui.cocoon.DSpaceFeedGenerator;
import org.dspace.app.xmlui.utils.ContextUtil;
@@ -72,6 +71,7 @@ import org.dspace.browse.BrowseItem;
import org.dspace.browse.BrowserScope;
import org.dspace.sort.SortOption;
import org.dspace.sort.SortException;
import org.dspace.usage.UsageEvent;
import org.dspace.utils.DSpace;
import org.dspace.content.Collection;
import org.dspace.content.DSpaceObject;

2
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java
View File

@@ -49,7 +49,6 @@ import org.apache.cocoon.environment.Request;
import org.apache.cocoon.util.HashUtil;
import org.apache.excalibur.source.SourceValidity;
import org.apache.log4j.Logger;
import org.dspace.app.statistics.UsageEvent;
import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
import org.dspace.app.xmlui.cocoon.DSpaceFeedGenerator;
import org.dspace.app.xmlui.utils.ContextUtil;
@@ -73,6 +72,7 @@ import org.dspace.browse.BrowseItem;
import org.dspace.browse.BrowserScope;
import org.dspace.sort.SortOption;
import org.dspace.sort.SortException;
import org.dspace.usage.UsageEvent;
import org.dspace.utils.DSpace;
import org.dspace.content.Collection;
import org.dspace.content.Community;

2
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ItemViewer.java
View File

@@ -54,7 +54,6 @@ import org.apache.cocoon.environment.Request;
import org.apache.cocoon.util.HashUtil;
import org.apache.excalibur.source.SourceValidity;
import org.apache.log4j.Logger;
import org.dspace.app.statistics.UsageEvent;
import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
import org.dspace.app.xmlui.utils.ContextUtil;
import org.dspace.app.xmlui.utils.DSpaceValidity;
@@ -77,6 +76,7 @@ import org.dspace.content.crosswalk.DisseminationCrosswalk;
import org.dspace.core.Constants;
import org.dspace.core.LogManager;
import org.dspace.core.PluginManager;
import org.dspace.usage.UsageEvent;
import org.dspace.utils.DSpace;
import org.jdom.Element;
import org.jdom.Text;

2
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java
View File

@@ -62,7 +62,6 @@ import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.environment.http.HttpResponse;
import org.apache.cocoon.reading.AbstractReader;
import org.apache.cocoon.util.ByteRange;
import org.dspace.app.statistics.UsageEvent;
import org.dspace.app.xmlui.utils.AuthenticationUtil;
import org.dspace.app.xmlui.utils.ContextUtil;
import org.dspace.authorize.AuthorizeException;
@@ -76,6 +75,7 @@ import org.dspace.core.ConfigurationManager;
import org.dspace.core.Constants;
import org.dspace.core.Context;
import org.dspace.handle.HandleManager;
import org.dspace.usage.UsageEvent;
import org.dspace.utils.DSpace;
import org.xml.sax.SAXException;

2
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/UsageLoggerAction.java
View File

@@ -1,10 +1,10 @@
package org.dspace.app.xmlui.cocoon;
import org.dspace.app.statistics.UsageEvent;
import org.dspace.app.xmlui.utils.ContextUtil;
import org.dspace.app.xmlui.utils.HandleUtil;
import org.dspace.core.Context;
import org.dspace.core.ConfigurationManager;
import org.dspace.usage.UsageEvent;
import org.dspace.utils.DSpace;
import org.dspace.content.DSpaceObject;
import org.dspace.content.Bitstream;

2
dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/WEB-INF/spring/applicationContext.xml
View File

@@ -29,7 +29,7 @@
<bean id="dspace.eventService" factory-bean="dspace" factory-method="getEventService"/>
<!-- Inject the Default LoggerUsageEventListener into the EventService -->
<bean class="org.dspace.app.statistics.LoggerUsageEventListener">
<bean class="org.dspace.usage.LoggerUsageEventListener">
<property name="eventService" >
<ref bean="dspace.eventService"/>
</property>