FWD » Build and Source Control

At this time, the only customer references are for TIMCO and Majic. The P2J project itself should NEVER have customer-specific references (even in the comments). The primary reason is that all code should be generic. But a secondary reason is to honor our confidentiality agreements with our customers. Putting such data in our code or documentation breaks that confidentiality.

Please carefully search through all the code, javadoc, comments, testcases, scripts, package.html files and so forth (the whole project). Look for explicit references to timco and majic. But it is important to note that these may be mis-spelled. For example, in com/goldencode/p2j/admin/client/AdminACL.java there is this code: showByResourceType("majic-function").

Please also look for any references to TIMCO or Majic in our books.

And in the testcases, there are many such references.

In all the found cases, please prepare modifications to safely remove/replace the references. For example, in the testcases, such references in strings can be replaced with some other "fake" text that is of the right length.

For anything that is not obvious, please discuss the approach with Constantin or Stanislav.

There are also some Progrees ".p" files that contain reference to timco or majic should those reference be replace or deleted?

Any 4GL code (.p) files that reference TIMCO or Majic should be modified to eliminate those references. The testcases should still work, but you can make fake names to replace TIMCO and Majic.

• p2j/scr/com/goldencode/expr/package.html contains reference to timco path html:
  The class is loaded directly from memory into the JVM via a <a href="file:///home/ecf/timco/p2j/src/com/goldencode/expr/ExpressionClassLoader.html">custom class loader</a>.
  In this case the class exists in the project but there is no ExpressionClassLoader.html code. Modified the code to:
  The class is loaded directly from memory into the JVM via a <a href="file:///../p2j/src/com/goldencode/expr/ExpressionClassLoader.html">custom class loader</a>.
  In case the ExpressionClassLoader.html will be added this link can be updated.

• Replaced Majic or timco reference in with placeholders of same or smaller size(where smaller checked if there might be ui problems with length)

• Deleted or replaced Majic or timco references from other sources depending on importance keeping resource name change persistent in code.

• Some documentation resources seem to contain obsolete information.For example p2j/p2j_project_guide.html describes install for p2j Milestone 12 (M12) which was delivered October 1, 2007
  this includes archives p2j_20071001.zip and and majic of the form majic_20071001<..>.zip(removed / changed information regarding the majic files ).
  Also in p2j/design/p2j_high_level_design.html beside the majic references there are choices and technologies specific to the majic project ( for example X-Tools)
  Should these documents be removed/redone in the future?

I think the reference to ExpressionClassLoader.html was intended to point to the JavaDoc version which exists (in the built version of P2J) as dist/docs/api/com/goldencode/expr/ExpressionClassLoader.html. I think you can reference this document via a more relative path that will allow it to be resolved. That path should NOT include the top level p2j/ directory. It shouldn't even contain the dist/docs/ path as we cannot be sure of anything except that the api/com/goldencode... will be there in the JavaDoc. Since the package.html that has the reference is in the same directory, can't the reference be cut down to just "ExpressionClassLoader.html" or "./ExpressionClassLoader.html"?

    Replaced Majic or timco reference in with placeholders of same or smaller size(where smaller checked if there might be ui problems with length)

    Deleted or replaced Majic or timco references from other sources depending on importance keeping resource name change persistent in code.

Good.

Leave the p2j_project_guide.html alone for now. I have pending edits there and will make sure to remove the timco and majic references.

Please make a list (here in the issue history) of the references in the p2j_high_level_design.html. I want to review those and give you feedback. But, yes, I will want you to change that document to remove/replace those references.

The p2j/testcases/simple/server/stdsrvkey.store is a TIMCO-specific file.

Please create new key(s), CA and a store file as needed to replace this file. You will have to update the directory too. You can follow the process documented in the P2J Runtime Installation, Configuration and Administration Guide.

The new version used here should be different from the new one that is being created for chemtutor. Add this to your proposed update.

Feedback:

1. The update zip file name shouldn't have the extra _ between "upd" and the sortable date. And there should be the "a" at the end of the name.

2. The update zip should have the p2j/ path prefix included.

3. The reference to Anita in design/p2j_high_level_design.html can be removed. It is something TIMCO-specific.

4. The change to src/com/goldencode/p2j/admin/client/AdminACL.java is incorrect. There is no such resource as "app-function". The problem is that this is real Majic code that is mixed into our code. The feature that is provided here should be exposed as a generic hook AND the code that is showing the majic-function resource ACLs should be moved to Majic and exposed via this hook. Please discuss this with Stanislav and Constantin.

5. The references to "app-functions" in src/com/goldencode/p2j/security/SecurityAdmin.java should instead be something more descriptive like "application-specific-acls".

6. The entire "Use of Multiple Databases" section should be deleted from src/com/goldencode/p2j/uast/package.html.

7. The src/com/goldencode/p2j/ui/ColorSpec.java should just delete the text "- not used in MAJIC" instead of changing the word MAJIC to application.

8. In src/com/goldencode/p2j/ui/FillInConfig.java, just remove the affected comment completely.

9. In src/com/goldencode/p2j/ui/chui/ThinClient.java, the first change should replace "found in MAJIC training menu.Roster report." with "found in customer application code.".

10. I see in the testcases (the .p files) that there are references to GSO, GREENSBORO and SYMAN/syman. These should be removed too, as they are specific to TIMCO/Majic.

11. All .java files need to be checked to see if their copyright notice dates need to be changed.

12. All .java files need to have a history entry added.

Feedback:

1. In MajicAdminClient the @Override annotation should be after the JavaDoc and before the method. Also make sure the alignment/spacing is right.
2. ClientAccountExtension is missing a history entry AND the copyright date needs update.
3. STANISLAV: what do you think about the placement of this new showStandaloneAcls() as part of ClientAccountExtension? It seems out of place to me, but I'm not sure where else it should go.
4. Don't include the character.java (it has your unapproved quoter() methods). It has nothing to do with this update, right?

3. STANISLAV: what do you think about the placement of this new showStandaloneAcls() as part of ClientAccountExtension? It seems out of place to me, but I'm not sure where else it should go.

You don't need showStandaloneAcls function:
1. make AdminACL.showByResourceType public
2. remove

if (standalone)
{
  showByResourceType("majic-function");
}

AdminACL aacl = new AdminACL(client, true, name);
aacl.showByResourceType("majic-function");

Yes, I like this approach much better.

Costin: please implement as Stanislav has suggested.

On the testcase changes, you can go ahead and check them into the new Bazaar testcases project.

So the testcase changed files should not be included in the proposed update archive?

In regards to the testcases, they should be removed from the archive since they are no longer part of P2J. The archive is a way to distribute the P2J changes to systems that don't have Bazaar access.

The design/ changes should be checked into the design project and removed from the P2J archive. Also, the P2J archive name is the same as the proposed majic archive name.

I'm not sure if the added code in MajicAdminClient needs to be further down in the method. Otherwise the change looks OK.

Please test this code path in the Admin UI of a running Majic server.

Go ahead with regression testing.

Stanislav: what do you think about the admin console changes? Have you tried them out?

Sorry, I spoke too soon. The SecurityAdmin.java needs to be merged with the one in Bazaar. It has an OM change for H059. Your change will now be H060.

Constantin: on further review of all the changes, I don't see anything here that affects the runtime, except for the admin console changes. Do you see anything I am missing?

If not, then we really don't need to do the regression testing. The final review and check by SVL will be enough.

Constantin: on further review of all the changes, I don't see anything here that affects the runtime, except for the admin console changes. Do you see anything I am missing?

The admin_login.html file has no real change, except that it messes up the format - this should be removed from the archive.

If not, then we really don't need to do the regression testing. The final review and check by SVL will be enough.

Regression testing is not needed.

Please remove the admin_login.html and repost the update.

I'm fine with these changes. However some notes:
1. if you need to change couple of sentences in html, just use a text editor otherwise all html may be reformatted
2. p2j sources should reside in update*.zip/p2j/src, NOT update*.zip/src
3. if a function was made public, its place in the class should be changed accordingly (AdminACL)

2. p2j sources should reside in update*.zip/p2j/src, NOT update*.zip/src

Stanislav, with the latest coding/developer standards, the correct path is update*.zip/src (so you can unzip the archive directly in the root project folder, not in the parent folder).

1. Check in the P2J changes to the p2j project in Bazaar.
2. Check in the Majic change to the timco project in CVS.
3. Work with Constantin to apply/rebuild the changes to staging. I have already changed the ownership of staging to his userid.
4. Distribute the 2 update zip files to the team.

commited to bzr and csv and sent update mail

The updates have been applied to staging. Majic and P2J was rebuilt.