You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2007/05/11 00:02:26 UTC
svn commit: r537011 [2/2] - in /portals/jetspeed-2/trunk:
components/portal/src/java/org/apache/jetspeed/container/session/
components/portal/src/java/org/apache/jetspeed/layout/ajax-xml/
components/portal/src/java/org/apache/jetspeed/layout/impl/ comp...
Modified: portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java?view=diff&rev=537011&r1=537010&r2=537011
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java Thu May 10 15:02:25 2007
@@ -4,74 +4,121 @@
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.statistics.impl;
-
-import org.apache.jetspeed.statistics.UserStats;
-
-/**
- * UserStatsImpl
- *
- * @author <a href="mailto:chris@bluesunrise.com">Chris Schaefer </a>
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor </a>
- * @version $Id: $
- */
-public class UserStatsImpl implements UserStats
-{
-
- private String username;
-
- private int numberOfSessions;
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jetspeed.statistics.UserStats#getNumberOfSessions()
- */
- public int getNumberOfSessions()
- {
- return numberOfSessions;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jetspeed.statistics.UserStats#getUsername()
- */
- public String getUsername()
- {
-
- return username;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jetspeed.statistics.UserStats#setNumberOfSession(int)
- */
- public void setNumberOfSession(int number)
- {
- numberOfSessions = number;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jetspeed.statistics.UserStats#setUsername(java.lang.String)
- */
- public void setUsername(String username)
- {
- this.username = username;
-
- }
-}
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.statistics.impl;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.apache.jetspeed.statistics.UserStats;
+
+import com.sun.org.apache.bcel.internal.util.ByteSequence;
+
+/**
+ * UserStatsImpl
+ *
+ * @author <a href="mailto:chris@bluesunrise.com">Chris Schaefer </a>
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor </a>
+ * @version $Id: $
+ */
+public class UserStatsImpl implements UserStats
+{
+
+ private String username;
+
+ private int numberOfSessions;
+
+ private InetAddress inetAddress;
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.jetspeed.statistics.UserStats#getNumberOfSessions()
+ */
+ public int getNumberOfSessions()
+ {
+ return numberOfSessions;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.jetspeed.statistics.UserStats#getUsername()
+ */
+ public String getUsername()
+ {
+
+ return username;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.jetspeed.statistics.UserStats#setNumberOfSession(int)
+ */
+ public void setNumberOfSession(int number)
+ {
+ numberOfSessions = number;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.jetspeed.statistics.UserStats#setUsername(java.lang.String)
+ */
+ public void setUsername(String username)
+ {
+ this.username = username;
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.statistics.UserStats#getInetAddress()
+ */
+ public InetAddress getInetAddress() {
+ return inetAddress;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.statistics.UserStats#setInetAddress(java.net.InetAddress)
+ */
+ public void setInetAddress(InetAddress inetAddress) {
+ this.inetAddress = inetAddress;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.statistics.UserStats#setInetAddressFromIp(java.lang.String)
+ */
+ public void setInetAddressFromIp(String ip) throws UnknownHostException {
+ this.inetAddress = InetAddress.getByName(ip);
+ }
+
+ /**
+ * Checks whether these two object match. Simple check for
+ * just the ipaddresse and username.
+ *
+ * @param Object instanceof UserStats
+ */
+ public boolean equals(Object obj) {
+
+ boolean equals = true;
+ if(!(obj instanceof UserStats))
+ return false;
+
+ UserStats userstat = (UserStats)obj;
+ if(this.inetAddress.equals(userstat.getInetAddress()) && this.username.equals(userstat.getUsername()))
+ equals = true;
+
+ return equals;
+ }
+}
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax-layout.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax-layout.xml?view=diff&rev=537011&r1=537010&r2=537011
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax-layout.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax-layout.xml Thu May 10 15:02:25 2007
@@ -493,6 +493,41 @@
<ref bean="org.apache.jetspeed.page.PageManager"/>
</constructor-arg>
</bean>
+
+<bean id="AjaxGetUserInformation"
+ class="org.apache.jetspeed.layout.impl.GetUserInformationAction">
+ <constructor-arg index="0">
+ <value>org/apache/jetspeed/layout/ajax-xml/userinfo.vm</value>
+ </constructor-arg>
+ <constructor-arg index="1">
+ <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+ </constructor-arg>
+ <constructor-arg index='2'>
+ <ref bean="org.apache.jetspeed.security.UserManager"/>
+ </constructor-arg>
+</bean>
+
+<bean id="AjaxGetUserList"
+ class="org.apache.jetspeed.layout.impl.GetUserListAction">
+ <constructor-arg index="0">
+ <value>org/apache/jetspeed/layout/ajax-xml/userlist.vm</value>
+ </constructor-arg>
+ <constructor-arg index="1">
+ <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+ </constructor-arg>
+ <constructor-arg index='2'>
+ <ref bean="org.apache.jetspeed.security.UserManager"/>
+ </constructor-arg>
+ <constructor-arg index='3'>
+ <ref bean="PortalStatistics"/>
+ </constructor-arg>
+ <constructor-arg index='4'>
+ <ref bean="org.apache.jetspeed.container.session.PortalSessionsManager"/>
+ </constructor-arg>
+ <constructor-arg index='5'>
+ <ref bean="RolesSecurityBehavior"/>
+ </constructor-arg>
+</bean>
<bean id="AjaxActionMap" class="java.util.HashMap">
<constructor-arg index="0">
@@ -572,6 +607,12 @@
<entry key="updatelink">
<ref bean="AjaxUpdateLink"/>
</entry>
+ <entry key="getuserinfo">
+ <ref bean="AjaxGetUserInformation"/>
+ </entry>
+ <entry key="getuserlist">
+ <ref bean="AjaxGetUserList"/>
+ </entry>
</map>
</constructor-arg>
</bean>
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-services.xml?view=diff&rev=537011&r1=537010&r2=537011
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-services.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-services.xml Thu May 10 15:02:25 2007
@@ -100,7 +100,7 @@
<ref bean="org.apache.jetspeed.prefs.PreferencesProvider"/>
</entry>
<entry key="org.apache.jetspeed.container.session.PortalSessionsManager">
- <bean class="org.apache.jetspeed.container.session.PortalSessionsManagerImpl"/>
+ <ref bean="org.apache.jetspeed.container.session.PortalSessionsManager"/>
</entry>
<entry key="SecurityAccessController">
<ref bean="org.apache.jetspeed.security.SecurityAccessController"/>
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/security-managers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/security-managers.xml?view=diff&rev=537011&r1=537010&r2=537011
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/security-managers.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/security-managers.xml Thu May 10 15:02:25 2007
@@ -39,6 +39,10 @@
<constructor-arg ><ref bean="org.apache.jetspeed.security.SecurityProvider"/></constructor-arg>
</bean>
+ <!-- Security: Session Manager -->
+ <bean id="org.apache.jetspeed.container.session.PortalSessionsManager"
+ class="org.apache.jetspeed.container.session.PortalSessionsManagerImpl" />
+
<!-- Security: Permission Manager -->
<bean id="org.apache.jetspeed.security.impl.PermissionManagerImpl"
class="org.apache.jetspeed.security.impl.PermissionManagerImpl" />
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org