Subversion is arguably the most popular version control system as of now. No wonder NetBeans has very good support for Subversion. I personally feel that a java developer must be familiar with both these tools. This article shall help you to get started with both these tools.

Objectives:

- To create a simple java project in NetBeans.

- . . . → Read More: Subversion and NetBeans – A quick start guide]]> Introduction:

Subversion is arguably the most popular version control system as of now. No wonder NetBeans has very good support for Subversion. I personally feel that a java developer must be familiar with both these tools. This article shall help you to get started with both these tools.

Objectives:

- To create a simple java project in NetBeans.

- To import the java project into the subversion repository.

- To commit the changes made in a java source file.

- To view the revision history of a java source file which was changed.

- To rollback to the previous revision of the java source file.

Requirements:

- NetBeans 6.1 Beta or NetBeans 6.0

- Subversion

- TortoiseSVN

- Though not mandatory, but a basic knowledge of subversion concepts.

Note: You can read this article to learn how to install/configure Subversion and TortoiseSVN.

Step 1:

Create a new “Java Application” project called “SimpleLogin”.

Step 2:

Create a new JFrame called “LoginFrame” under the package “org.example.simplelogin” and add the necessary components as shown below.

Step 3:

Name the swing components accordingly.

Your application should like this now on preview:

Step 4:

Create a java class named “LoginService” under the package “org.example.simplelogin”.

Step 5:

Add the following code to the LoginService class.

Here we are defining a simple method which shall return true if the username is “guest” and the password is “password”.

[smartads]

Step 6:

Now open “LoginFrame.java” and add the following methods.

The above methods are self explanatory. We are just doing a simple validation and calling the login method we defined previously in the class LoginService.

Step 7:

Now double click the login “button” in the design mode of LoginFrame.java to create the event handling method named “loginButtonActionPerformed”. Add the following code to call the “performLogin” method.

That’s it.

Step 8:

Run the project.

If you enter the username as “guest” and password as “password”, you will get an output like this.

Otherwise, you will be getting an output like this.

Ok, our simple login application is ready for prime time . Now let us import this project into a subversion repository.

Step 9:

Create an empty folder called “MyRepository” in a preferred location.

Step 10:

Create a subversion repository in the empty “MyRepository” folder as mentioned below, by right clicking anywhere inside the windows explorer.

Accept the default option (FSFS) in the “Create Repository” window.

That’s it. Your repository should be ready when you press “OK” and it should look something like this.

Step 11:

Let us import the NetBeans project we have created into the subversion repository. Right click the NetBeans project we have created and then click “Versioning -> Import into Subversion Repository”.

NetBeans will prompt you with a window. Enter the path of your repository as shown below.

Click the “Next” button and enter the “Repository Folder” name into which you would like to import your project. To make things simple, let us enter our NetBeans project name itself as the “Repository Folder” name. Also enter a small description about this import activity as shown below.

We are almost there. Click the “Next” button and the IDE will show a window like this.

Accept the default entries and click “Finish”. Congratulations! you have imported your project successfully into the subversion repository.

Right click anywhere in your desktop/windows explorer and click “TortoiseSVN -> Repo-Browser” and then enter the path of your subversion repository. You can see all your project files sitting comfortably inside the subversion repository.

Step 12:

Let us play around with some more cool subversion integration features offered by NetBeans. Open the class “LoginService.java” and change the value of “DUMMY_PASSWORD” from “password” to “guest”.

You can see the IDE markup a blue shade near the line you made the change. This indicates that your source file has got something different than the version in the repository. You can also note that the IDE change your java source file name’s font-color to blue.

Let us turn our focus to the editor window again. Click the blue stripe shown by the IDE near the  place where you made changes to the source file. The IDE will popup a small hint-window.

You can see the previous value of the DUMMY_PASSWORD there. The IDE also provides you a set of buttons to revert back the changes or to have a “diff” view on the changes made. Let us explore the “diff’ functionality of the IDE first by clicking the “diff” button.

The IDE will display the “diff” view of the “working copy” and the “HEAD” revision (the latest committed version) in the repository.

From the above figure, you can see the current and previous value of the string DUMMY_PASSWORD. Now you can revert back to the old value of “DUMMY_PASSWORD” by clicking the replace  button (displayed like an arrow)

When you press the “replace” button, the IDE will replace the “current” value with the “original” value.

The “diff” view provided by the IDE will be very useful to examine and compare the changes made to the “working copy”  alongwith the option to revert back to the original version in the repository. But if all you need is to quickly revert back some change to the original version in the repository, you can click on the blue strip in the source code and click the “revert” button.

That’s cool, right?

Step 13:

Enough playing. Now let us commit the changes we made in our source file. Ensure that the source file you are willing to commit is in focus and click the menu “Versioning -> Commit”

When you click the “Commit” menu item, the IDE will prompt you with a window to enter the “message” for this commit operation. Enter a commit message and click the “Commit” button.

Step 14:

Let us explore the history of our source file and see the the changes we made all along. Click the “Versioning -> Search History” menu.

The IDE will display all the versions of the source file.

In the “Search History” window, the IDE offers two views, “summary” view and “diff” view. By default, the IDE displays the “summary” view. The “diff” view contains more information.

You can straightaway “revert” or “rollback” to previous revisions just by right clicking a particular revision.

Nice, isn’t it? There are still a lot more cool subversion features offered by NetBeans. I will blog more about that later. I hope the information provided here was useful to you.

SolitaryGeek Poll

TortoiseSVN and Apache comes to your aid. TortoiseSVN is a powerful tool for Subversion, which helps you . . . → Read More: Extending Subversion by using TortoiseSVN]]> Though Subversion is a powerful version control system, it’s command-line based interface may not appeal to some users who used other version control systems like Visual Source Safe. And what if you want to remotely access your repository as well?

TortoiseSVN and Apache comes to your aid. TortoiseSVN is a powerful tool for Subversion, which helps you to issue most of the subversion commands from your windows explorer. Subversion has an inbuilt “svnserve” utility which helps you to expose your repository to remote users, but it’s highly recommended to use the flexible Apache Web Server for this purpose. Subversion comes with it’s own apache modules to expose your repository to remote users. However, in this article we will not focus on Apache. I’m planning to write about the apache integration in my next post. Please be patient

Objective:

In this article you will learn how to install Subversion and TortoiseSVN and use them to create a repository, import files into the repository and view the repository.

Step 1: Install Subversion

Download subversion windows installer for Apache 2.2.x. (Download the file called “svn-x.y.z-setup.exe” and run the installer. Installing should be a straight forward option.

You might see the following windows. They are self explanatory.

Now you should have subversion successfully installed in your machine. To verify that, open the command prompt and type “svn –version”. If you see something like below, pat your head, you have successfully installed subversion.

If you couldn’t see the above mentioned message, you might want to check your “Path” environment variable and add your subversion installation directory to the “Path”.

Step 2: Install TortoisSVN

Download TortoiseSVN from here.

That’s it. Now the installer setup might prompt you to restart your system to complete the installation process. Accept it.

Step 3: Create a Subversion Repository

Now, it’s time to create a subversion repository. Though it’s possible to use the subversion’s “svnadmin” command to create the repository, we will use TortoiseSVN to achieve that.

3a) First, choose a appropriate location to keep all your repositories. In my case it’s “F:\Subversion”. Let us call this folder as REPOSITORY_ROOT. Now, let us create an empty directory called “MyRepository” inside REPOSITORY_ROOT. It should look something like this:

3b) Now, right click inside the folder REPOSITORY_ROOT\MyRepository, and click “TortoiseSVN -> Create repository here” menu.

3c) TortoisSVN will now prompt you with a message box like this:

Leave the default option (Native file system), and click “OK”. You can see a bunch of files inside the “MyRepository” folder like this:

Great!! This is your subversion repository.

Step 4: Import files into your subversion repository

4a) Let us add some files inside our newly created subversion repository. Right click a folder of your choice and click “TortoiseSVN -> Import”

4b) Enter the appropriate repository path where you would like to import these files into. In my case it’s “file:///f:/subversion/myrepository/photos”.

4C) When you press “OK”, TortoiseSVN will import all the files/folders inside the folder which you selected for the import operation into the subversion repository.

4D) Press “OK”. Now we have finished importing the files into our new subversion repostiory. It’s now time to view the content of our repository.

Step 5: Viewing the content of your subversion repository

5a) TortoiseSVN provides a nice “Repository Browser” option to view the content of your subversion repository. Right anywhere in your explorer window/desktop and click “TortoiseSVN -> Repo-browser”.

5B) Enter the url of your subversion repository. In my case, it’s “file:///f:/subversion/myrepository” and click “OK”.

5C) That’s it, now TortoiseSVN will list down all the files inside your repository.

Summary:

In this article, you learned to:

- install Subversion

- install TortoiseSVN

- create a new repository using TortoiseSVN

- import files into the subversion repository using TortoiseSVN

- view the content of the subversion repository using TortoiseSVN

What next?

I initially thought of even writing about installing, configuring apache/websvn in this article itself. But it already took me nearly 3 hours to finish writing this. So please bear with me. I’ll come with a Part II of this article where you will learn how to use apache/websvn along with subversion to make the interaction with your version control system a pleasure. See you again.

Added on August 2, 2008:

I have written an article named “Extending Subversion with Apache“. This article is about setting up Apache http server and configuring it to access subversion repositories. It also deals how to setup Authentication and Access control for your subversion repositories using Apache. Hope you find it useful.

SolitaryGeek Poll