ingo schuster wrote:
> OK,
>
> I switched the CVS to the latest version of turbine (2000-11-16, 22:28).
> Some things that have changed:
> * I added new jars: velocity-0.7, village-1.5, turbine-2.1-dev-unreleased.
>
> MAKE SURE TO UPDATE YOUR CLASSPATHES!!!
>
> Actually, turbine comes along withsome more new jars, but I'm not sure
> of whether we need really them -> my integrating test worked ok without them.
> * Turbine Resources.properties changed quite a lot
>
> UPDATE YOUR TRP!!!
>
> * I had to hack turbine: I removed the "final" statement at turbine servlet.
> SORRY Jon, I now this is going to piss you off. However I wanted to use
> the latest version of turbine and I just couldn't do all the changes that
> would have been necessary to deal with the JetspeedServlet problem today.
> I'm sure we'll fix this the next days...
>
> I hope I didn't break everything. I carfully updated the TRP, tested
> everything in my test environment -- and couldn't find the "clean" AND
> updated CVS version of TRP afterwards :-((. Must have replaced it by
> mistake. So I had to merge my changes into the CVS TRP again!
> Still, I'm pretty sure that I didn't miss any update and there will be no
> problems...
>
I have done the same recently and I got it working. I paste you my current diffs.
Ignore what it is not relevant. Just to check that we are on the same track. My
copy seems to work allright. I tried switching the castor files, but the Jetspeed
would not build complaining about missing files. There is trash (debugging
messages) and other patches that I'm testing.
I know, I will get plenty of conflicts when you commit, but I needed to have it
already :-)
> Index: build/build.xml
> ===================================================================
> RCS file: /products/cvs/jetspeed/jetspeed/build/build.xml,v
> retrieving revision 1.83
> diff -r1.83 build.xml
> 16a17
> >
> 93c94,96
> < debug="${debug}"/>
> ---
> > debug="${debug}"
> > deprecation="${deprecation}"
> > />
> 102c105
> < compress="false"
> ---
> > compress="true"
> Index: src/java/org/apache/jetspeed/JetspeedServlet.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/JetspeedServlet.java,v
> retrieving revision 1.2
> diff -r1.2 JetspeedServlet.java
> 81c81
> < import Turbine;
> ---
> > import org.apache.turbine.Turbine;
> Index: src/java/org/apache/jetspeed/cache/disk/DiskCacheUtils.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/cache/disk/DiskCacheUtils.java,v
> retrieving revision 1.7
> diff -r1.7 DiskCacheUtils.java
> 100a101,107
> >
> > private static String hostName = "localhost";
> > static {
> > try {
> > hostName = java.net.InetAddress.getLocalHost().getHostName();
> > } catch (Throwable t) {}
> > }
> 205,206c212,214
> < if ( ( url.indexOf( "http://localhost" ) == 0 ) ||
> < ( url.indexOf( "http://127.0.0.1" ) == 0 ) ||
> ---
> > if ( ( url.indexOf( "http://localhost" ) == 0 ) ||
> > ( url.indexOf( "http://127.0.0.1" ) == 0 ) ||
> > ( url.indexOf( "http://" + hostName ) == 0 ) ||
> 224c232
> < Log.note("CACHE: file:// url in isLocal!!");
> ---
> > Log.note("CACHE: SHOULD NOT HAPPEN file:// url in isLocal!!");
> Index: src/java/org/apache/jetspeed/cache/disk/JetspeedDiskCacheEntry.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/cache/disk/JetspeedDiskCacheEntry.java,v
> retrieving revision 1.14
> diff -r1.14 JetspeedDiskCacheEntry.java
> 254c254
> < bos.write(chars, 0, readCount);
> ---
> > bos.write(chars, 0, readCount);
> 258a259,261
> > int n;
> > if ( ( n = bos.toString().indexOf("?", 100) ) >= 0 )
> > System.err.println(" getData: contains ? at pos: " + n );
> 295c298
> < from the WEB server is allright
> ---
> > from the WEB server is allright WRT encoding
> 297,299c300
> < using the default local encoding. (Not sure about this)
> < We possibly should read external URLs via a reader, and write them
> < always using utf (or a similar unicode capable encoding)
> ---
> > using UTF8 encoding
> 310c311,313
> < reader = new InputStreamReader( new FileInputStream(
>this.getFile() ), "utf-8" );
> ---
> > //For files, we are assuming UTF8
> > // instead of local encoding
> > reader = new InputStreamReader( new FileInputStream(
>this.getFile() ), "UTF8" );
> 315c318,320
> < Log.note("Disk Cache Entry: getReader file -> " + this.getURL() +
>" encoding -> " +
> ---
> > Log.note("Disk Cache Entry: getReader file -> " +
> > this.getURL() +
> > " encoding -> " +
> 322a328
> > // If the URL has a proper encoding, use it
> 324a331
> > // else take it from configuration
> 328c335,337
> < Log.note("Disk Cache Entry: getReader encoding -> " +
> ---
> > Log.note("Disk Cache Entry: getReader URL -> " +
> > this.getURL() +
> > " encoding -> " +
> Index: src/java/org/apache/jetspeed/portal/Portlet.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/portal/Portlet.java,v
> retrieving revision 1.36
> diff -r1.36 Portlet.java
> 167a168,169
> > FIXME: SGP: init should carry PortletConfig as parameter...
> >
> 175a178,179
> >
> > FIXME: SGP: Should dissapear (setPortletContext( PortletContext pc ) instead)
> Index: src/java/org/apache/jetspeed/portal/PortletConfig.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/portal/PortletConfig.java,v
> retrieving revision 1.37
> diff -r1.37 PortletConfig.java
> 85a86,87
> > //SGP: FIXME: current set belong to the PortletContext,
> > // not to the PortletConfig, as it is dynamic.
> Index: src/java/org/apache/jetspeed/portal/PortletController.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/portal/PortletController.java,v
> retrieving revision 1.46
> diff -r1.46 PortletController.java
> 128a129,130
> > FIXME: SGP: init should carry PortletConfig as parameter...
> >
> 134a137,138
> >
> > FIXME: SGP: it should dissapear...
> Index: src/java/org/apache/jetspeed/portal/PortletSet.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/portal/PortletSet.java,v
> retrieving revision 1.15
> diff -r1.15 PortletSet.java
> 137a138,140
> >
> > FIXME: SGP: init should carry PortletConfig as parameter...
> >
> 224a228,229
> > //FIXME: SGP: This is not multithreading-safe.
> > // Should be done with portletContext, and in the context of a request
> Index: src/java/org/apache/jetspeed/portal/controllers/AbstractPortletController.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/portal/controllers/AbstractPortletController.java,v
> retrieving revision 1.14
> diff -r1.14 AbstractPortletController.java
> 70a71,72
> >
> > // FIXME: SGP: multithreading. Var is not safe
> 72c74,76
> < private RunData rundata = null;
> ---
> > // FIXME: SGP: multithreading. Var is not safe
> > //private RunData rundata = null;
> >
> 108c112
> < public void setRunData(RunData rundata) {
> ---
> > /* public void setRunData(RunData rundata) {
> 110c114
> < }
> ---
> > }*/
> 117c121
> < public RunData getRunData() {
> ---
> > /* public RunData getRunData() {
> 119c123
> < }
> ---
> > }*/
> Index: src/java/org/apache/jetspeed/portal/controllers/CardPortletController.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/portal/controllers/CardPortletController.java,v
> retrieving revision 1.10
> diff -r1.10 CardPortletController.java
> 87a88,105
> > * Our internal state: The selected card
> > */
> > private String card;
> >
> >
> > /**
> >
> > FIXME: SGP: Should take Config
> >
> > @author Santiago Gala
> > */
> > public void init() {
> > card = getConfig().getInitParameter( "defaultcard", "0" );
> > }
> >
> >
> >
> > /**
> 97,99c115,116
> < //FIXME: handling of rundata?
> < //String pane = conf.getParameters().getString( getParameterName() ,
>getCard() );
> < String pane = rundata.getParameters().getString( getParameterName() ,
>getCard() );
> ---
> > String pane = rundata.getParameters().getString( getParameterName() ,
> > getCard() );
> 231c248
> < getConfig().setInitParameter( "defaultcard", card );
> ---
> > this.card = card;
> 239c256
> < return getConfig().getInitParameter( "defaultcard", "0" );
> ---
> > return this.card;
> Index: src/java/org/apache/jetspeed/portal/controllers/GridPortletController.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/portal/controllers/GridPortletController.java,v
> retrieving revision 1.7
> diff -r1.7 GridPortletController.java
> 246c246
> < setRow(Integer.parseInt(conf.getInitParameter("column","0")));
> ---
> > setRow(Integer.parseInt(conf.getInitParameter("row","0")));
> Index: src/java/org/apache/jetspeed/portal/factory/PortletSetFactory.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/portal/factory/PortletSetFactory.java,v
> retrieving revision 1.14
> diff -r1.14 PortletSetFactory.java
> 376a377,379
> > //FIXME: SGP: Should not need rundata for the Config
> > // Should need it only for the PortletContext...
> > //This would save time on each new session.
> Index:
>src/java/org/apache/jetspeed/portal/factory/util/portletfactory/SecurityManager.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/portal/factory/util/portletfactory/SecurityManager.java,v
> retrieving revision 1.3
> diff -r1.3 SecurityManager.java
> 61,62c61,62
> < import org.apache.turbine.om.user.*;
> < // For new Turbine import org.apache.turbine.om.security.*;
> ---
> > //import org.apache.turbine.om.user.*;
> > import org.apache.turbine.om.security.*;
> Index: src/java/org/apache/jetspeed/portal/portlets/RSSPortlet.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/portal/portlets/RSSPortlet.java,v
> retrieving revision 1.39
> diff -r1.39 RSSPortlet.java
> 117c117,124
> < parser.parse( new InputSource( this.cleanse( content ) ) );
> ---
> > InputSource is = new InputSource( this.cleanse( content ) );
> >
> > //SGP Should make no difference ...
> > is.setEncoding( "UTF8" );
> >
> > parser.setFeature(
>"http://apache.org/xml/features/allow-java-encodings",
> > true );
> > parser.parse( is );
> Index: src/java/org/apache/jetspeed/portal/portlets/util/customizer/PSMLManager.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/portal/portlets/util/customizer/PSMLManager.java,v
> retrieving revision 1.2
> diff -r1.2 PSMLManager.java
> 54,55c54,55
> < import org.apache.turbine.om.user.*;
> < // For new Turbine import org.apache.turbine.om.security.*;
> ---
> > //import org.apache.turbine.om.user.*;
> > import org.apache.turbine.om.security.*;
> Index: src/java/org/apache/jetspeed/turbine/actions/CreateNewUserAndConfirm.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/turbine/actions/CreateNewUserAndConfirm.java,v
> retrieving revision 1.4
> diff -r1.4 CreateNewUserAndConfirm.java
> 66,68c66,69
> < //For new turbine import org.apache.turbine.om.security.*;
> < // import org.apache.turbine.om.security.peer.*;
> < import org.apache.turbine.om.user.peer.TurbineUserPeer;
> ---
> > //For new turbine
> > import org.apache.turbine.om.security.*;
> > import org.apache.turbine.om.security.peer.*;
> > //import org.apache.turbine.om.user.peer.TurbineUserPeer;
> Index: src/java/org/apache/jetspeed/turbine/actions/JLoginUser.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/turbine/actions/JLoginUser.java,v
> retrieving revision 1.4
> diff -r1.4 JLoginUser.java
> 65,67c65,69
> < // For new Turbine import org.apache.turbine.om.security.*;
> < import org.apache.turbine.om.user.peer.TurbineUserPeer;
> < import org.apache.turbine.om.user.peer.VisitorRolePeer;
> ---
> > // For new Turbine
> > import org.apache.turbine.om.security.*;
> > import org.apache.turbine.om.security.peer.*;
> > //import org.apache.turbine.om.user.peer.TurbineUserPeer;
> > //import org.apache.turbine.om.user.peer.VisitorRolePeer;
> Index: src/java/org/apache/jetspeed/turbine/actions/JetspeedSessionValidator.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/turbine/actions/JetspeedSessionValidator.java,v
> retrieving revision 1.9
> diff -r1.9 JetspeedSessionValidator.java
> 73,75c73,75
> < import org.apache.turbine.om.user.peer.*;
> < // For new turbine import org.apache.turbine.om.security.*;
> < // import org.apache.turbine.services.security.TurbineSecurity;
> ---
> > //import org.apache.turbine.om.user.peer.*;
> > import org.apache.turbine.om.security.*;
> > import org.apache.turbine.services.security.TurbineSecurity;
> 97,98c97,98
> < data.setUser( UserFactory.getUser() );
> < // For new Turbine data.setUser( TurbineSecurity.getAnonymousUser() );
> ---
> > //data.setUser( UserFactory.getUser() );
> > data.setUser( TurbineSecurity.getAnonymousUser() );
> Index: src/java/org/apache/jetspeed/turbine/actions/LogoutUser.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/turbine/actions/LogoutUser.java,v
> retrieving revision 1.3
> diff -r1.3 LogoutUser.java
> 64,68c64,69
> < import org.apache.turbine.om.security.AccessControlList;
> < //For new Turbine import org.apache.turbine.om.security.peer.*;
> < //import org.apache.turbine.services.security.TurbineSecurity;
> < //import org.apache.turbine.util.security.*;
> < import org.apache.turbine.om.user.peer.UserFactory;
> ---
> > //For new Turbine
> > import org.apache.turbine.om.security.peer.*;
> > import org.apache.turbine.services.security.TurbineSecurity;
> > import org.apache.turbine.util.security.*;
> > //import org.apache.turbine.om.security.AccessControlList;
> > //import org.apache.turbine.om.user.peer.UserFactory;
> 97,98c98,100
> < //For new turbine data.setUser( TurbineSecurity.getAnonymousUser() );
> < data.setUser( UserFactory.getUser() );
> ---
> > //For new turbine
> > data.setUser( TurbineSecurity.getAnonymousUser() );
> > //data.setUser( UserFactory.getUser() );
> Index: src/java/org/apache/jetspeed/turbine/actions/UpdateAccount.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/turbine/actions/UpdateAccount.java,v
> retrieving revision 1.4
> diff -r1.4 UpdateAccount.java
> 66,67c66,67
> < //import org.apache.turbine.om.security.peer.*;
> < import org.apache.turbine.om.user.peer.TurbineUserPeer;
> ---
> > import org.apache.turbine.om.security.peer.TurbineUserPeer;
> > //import org.apache.turbine.om.user.peer.TurbineUserPeer;
> Index: src/java/org/apache/jetspeed/turbine/screens/EditAccount.java
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/java/org/apache/jetspeed/turbine/screens/EditAccount.java,v
> retrieving revision 1.3
> diff -r1.3 EditAccount.java
> 64,67c64,67
> < //For new Turbine import org.apache.turbine.om.security.*;
> < //import org.apache.turbine.om.security.peer.*;
> < import org.apache.turbine.om.user.*;
> < import org.apache.turbine.om.user.peer.*;
> ---
> > import org.apache.turbine.om.security.*;
> > import org.apache.turbine.om.security.peer.*;
> > //import org.apache.turbine.om.user.*;
> > //import org.apache.turbine.om.user.peer.*;
> Index: src/sql/external/Postgres_users_roles_permissions.sql
> ===================================================================
> RCS file:
>/products/cvs/jetspeed/jetspeed/src/sql/external/Postgres_users_roles_permissions.sql,v
> retrieving revision 1.1
> diff -r1.1 Postgres_users_roles_permissions.sql
> 83c83
> < OBJECTDATA varchar (255), -- oder doch
>bytea???
> ---
> > OBJECTDATA oid, -- to hold an object
> 85a86,91
> > CREATE RULE Visitor_delete_lo AS
> > ON DELETE TO Visitor
> > DO SELECT lo_unlink(old.OBJECTDATA);
> > -- This rule will delete the large object automatically when its row is deleted.
> >
> >
> 95c101
> < insert into VISITOR (LOGINID, PASSWORD_VALUE, FIRST_NAME, LAST_NAME, MODIFIED,
>CREATED ) values ('turbine', 'turbine', 'turbine', 'turbine', null, null );
> ---
> > insert into VISITOR (LOGINID, PASSWORD_VALUE, FIRST_NAME, LAST_NAME, MODIFIED,
>CREATED, CONFIRM_VALUE ) values ('turbine', 'turbine', 'turbine', 'turbine', null,
>null, 'CONFIRMED' );
>
>
> ingo.
>
> --
> --------------------------------------------------------------
> Please read the FAQ! <http://java.apache.org/faq/>
> To subscribe: [EMAIL PROTECTED]
> To unsubscribe: [EMAIL PROTECTED]
> Archives and Other: <http://marc.theaimsgroup.com/?l=jetspeed>
> Problems?: [EMAIL PROTECTED]
--
--------------------------------------------------------------
Please read the FAQ! <http://java.apache.org/faq/>
To subscribe: [EMAIL PROTECTED]
To unsubscribe: [EMAIL PROTECTED]
Archives and Other: <http://marc.theaimsgroup.com/?l=jetspeed>
Problems?: [EMAIL PROTECTED]
